packages: procps/procps.spec - fix build - LIBPROC variable is lost for som...

sparky sparky at pld-linux.org
Fri Jan 7 01:06:11 CET 2011


Author: sparky                       Date: Fri Jan  7 00:06:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build - LIBPROC variable is lost for some reason
- more rpm*flags
- set CC to false while installing - make sure it won'r try to recompile anything

---- Files affected:
packages/procps:
   procps.spec (1.131 -> 1.132) 

---- Diffs:

================================================================
Index: packages/procps/procps.spec
diff -u packages/procps/procps.spec:1.131 packages/procps/procps.spec:1.132
--- packages/procps/procps.spec:1.131	Fri Oct 16 22:42:25 2009
+++ packages/procps/procps.spec	Fri Jan  7 01:06:06 2011
@@ -131,23 +131,25 @@
 %build
 %{__make} proc/libproc.a \
 	CC="%{__cc}" \
-	ALL_CFLAGS="%{rpmcflags} -Wall -ffast-math" \
-	LDFLAGS="%{rpmldflags}" \
+	ALL_CFLAGS="%{rpmcppflags} %{rpmcflags} -Wall -ffast-math" \
+	LDFLAGS="%{rpmcflags} %{rpmldflags}" \
 	SHARED=0
-mv -f proc/libproc.a .
+%{__mv} proc/libproc.a .
 %{__make} clean
 
 %{__make} \
 	CURSES="-lncurses -ltinfo" \
 	CC="%{__cc}" \
-	ALL_CFLAGS="%{rpmcflags} -Wall -ffast-math" \
-	LDFLAGS="%{rpmldflags}"
+	ALL_CFLAGS="%{rpmcppflags} %{rpmcflags} -Wall -ffast-math" \
+	LDFLAGS="%{rpmcflags} %{rpmldflags}" \
+	LIBPROC="proc/libproc-%{version}.so"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir}/proc,%{_libdir},%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
+	CC=false \
 	DESTDIR=$RPM_BUILD_ROOT \
 	lib64=%{_lib} \
 	install="install -D" \
@@ -213,6 +215,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2011/01/07 00:06:06  sparky
+- fix build - LIBPROC variable is lost for some reason
+- more rpm*flags
+- set CC to false while installing - make sure it won'r try to recompile anything
+
 Revision 1.131  2009/10/16 20:42:25  zbyniu
 - patch for proper handle errors openning /proc in libproc
 - apps should do it but most don't
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/procps/procps.spec?r1=1.131&r2=1.132&f=u



More information about the pld-cvs-commit mailing list