packages: busybox/busybox.spec - updated linker flags passing (LDFLAGS is n...

[qboosh]

Author: qboosh                       Date: Fri Jun 17 16:07:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated linker flags passing (LDFLAGS is now passed to compiler not linker, so use rpmldflags)
- added dynamic bcond (allows to disable dynamic glibc-based version, which currently fails to build because of removed RPC/NIS APIs)

---- Files affected:
packages/busybox:
   busybox.spec (1.188 -> 1.189) 

---- Diffs:

================================================================
Index: packages/busybox/busybox.spec
diff -u packages/busybox/busybox.spec:1.188 packages/busybox/busybox.spec:1.189
--- packages/busybox/busybox.spec:1.188	Sun Mar 13 15:33:39 2011
+++ packages/busybox/busybox.spec	Fri Jun 17 18:07:54 2011
@@ -14,6 +14,7 @@
 #
 %bcond_with	altconfig	# use alternative config (defined by cfgfile)
 %bcond_with	linkfl		# creates links to busybox binary and puts them into file list
+%bcond_without	dynamic		# don't build dynamic (base) version
 %bcond_without	static		# don't build static version
 %bcond_without	initrd		# don't build initrd version
 %bcond_with	dietlibc	# build dietlibc-based initrd and static versions
@@ -169,7 +170,7 @@
 %{__make} \
 	%{?with_verbose:V=1} \
 	CROSS_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
-	LDFLAGS="%{ld_rpmldflags} -static" \
+	LDFLAGS="%{rpmldflags} -static" \
 %if %{with dietlibc}
 	LIBRARIES="-lrpc" \
 	CC="diet %{__cc}"
@@ -189,7 +190,6 @@
 %{__make} clean
 %endif
 
-
 %if %{with altconfig}
 install %{SOURCE3} .config
 %else
@@ -201,7 +201,7 @@
 %{__make} \
 	%{?with_verbose:V=1} \
 	CROSS_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
-	LDFLAGS="%{ld_rpmldflags} -static" \
+	LDFLAGS="%{rpmldflags} -static" \
 %if %{with dietlibc}
 	LIBRARIES="-lrpc" \
 	CC="diet %{__cc}"
@@ -221,25 +221,32 @@
 %{__make} clean
 %endif
 
+%if %{with dynamic}
 %{__make} oldconfig
 %{__make} \
 	%{?with_verbose:V=1} \
 	%{CrossOpts} \
 	CFLAGS_EXTRA="%{rpmcflags}" \
-	LDFLAGS="%{ld_rpmldflags}" \
+	LDFLAGS="%{rpmldflags}" \
 	CC="%{__cc}"
 %{__make} busybox.links docs/busybox.1
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/busybox}
 
-%{?with_static:install built/busybox.static $RPM_BUILD_ROOT%{_bindir}}
+%if %{with static}
+install -d $RPM_BUILD_ROOT%{_bindir}
+install built/busybox.static $RPM_BUILD_ROOT%{_bindir}
+%endif
+
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
 install built/busybox.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/busybox
 %endif
 
+%if %{with dynamic}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/busybox}
 install busybox.links $RPM_BUILD_ROOT%{_libdir}/busybox
 install docs/busybox.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
@@ -250,10 +257,12 @@
 %else
 install busybox $RPM_BUILD_ROOT%{_bindir}
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with dynamic}
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README .config
@@ -269,6 +278,7 @@
 
 %{_libdir}/busybox
 %{_mandir}/man1/*
+%endif
 
 %if %{with static}
 %files static
@@ -288,6 +298,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.189  2011/06/17 16:07:54  qboosh
+- updated linker flags passing (LDFLAGS is now passed to compiler not linker, so use rpmldflags)
+- added dynamic bcond (allows to disable dynamic glibc-based version, which currently fails to build because of removed RPC/NIS APIs)
+
 Revision 1.188  2011/03/13 14:33:39  areq
 - 1.18.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/busybox/busybox.spec?r1=1.188&r2=1.189&f=u