[packages/libparserutils] use our CC, do not overwrite Makefile's CFLAGS

glen glen at pld-linux.org
Sat Apr 27 15:55:12 CEST 2013


commit 49c5c6080da9e74f0d50ad4b18131ea63609beec
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 27 16:54:58 2013 +0300

    use our CC, do not overwrite Makefile's CFLAGS

 libparserutils.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/libparserutils.spec b/libparserutils.spec
index e8ee02d..c71d00d 100644
--- a/libparserutils.spec
+++ b/libparserutils.spec
@@ -62,24 +62,30 @@ Statyczna biblioteka libparserutils.
 %patch0 -p1
 
 %build
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-shared Q='' \
-	CFLAGS="%{rpmcflags} -Iinclude -Isrc" 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 -Isrc" 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/libparserutils.git/commitdiff/49c5c6080da9e74f0d50ad4b18131ea63609beec



More information about the pld-cvs-commit mailing list