[packages/libwapcaplet] pass our CC, do not overwrite CFLAGS

glen glen at pld-linux.org
Sat Apr 27 15:57:06 CEST 2013


commit de57e31cbb97eb750e5b8aa62f670c895c89011a
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 27 16:56:52 2013 +0300

    pass our CC, do not overwrite CFLAGS

 libwapcaplet.spec | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/libwapcaplet.spec b/libwapcaplet.spec
index f167dd8..c6588d7 100644
--- a/libwapcaplet.spec
+++ b/libwapcaplet.spec
@@ -52,23 +52,30 @@ Statyczna biblioteka libwapcaplet.
 %patch0 -p1
 
 %build
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-shared Q='' \
-	CFLAGS="%{rpmcflags} -Iinclude" LDFLAGS="%{rpmldflags}"
+export CC="%{__cc}"
+export CFLAGS="%{rpmcflags}"
+export LDFLAGS="%{rpmldflags}"
+
+%{__make} Q= \
+	PREFIX=%{_prefix} \
+	COMPONENT_TYPE=lib-shared
+
 %if %{with static_libs}
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-static Q='' \
-	CFLAGS="%{rpmcflags} -Iinclude" LDFLAGS="%{rpmldflags}"
+%{__make}  Q= \
+	PREFIX=%{_prefix} \
+	COMPONENT_TYPE=lib-static
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install Q='' \
+%{__make} install Q= \
 	lib=%{_lib} \
 	PREFIX=%{_prefix} \
 	COMPONENT_TYPE=lib-shared \
 	DESTDIR=$RPM_BUILD_ROOT \
 
 %if %{with static_libs}
-%{__make} install Q='' \
+%{__make} install Q= \
 	lib=%{_lib} \
 	PREFIX=%{_prefix} \
 	COMPONENT_TYPE=lib-static \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libwapcaplet.git/commitdiff/de57e31cbb97eb750e5b8aa62f670c895c89011a



More information about the pld-cvs-commit mailing list