rpms/busybox/devel busybox-1.1.1-ppc64.patch, NONE, 1.1 busybox.spec, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4420

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.1.1-ppc64.patch 
Log Message:
- add RPM_OPT_FLAGS
- add -minimal-toc option


busybox-1.1.1-ppc64.patch:
 Rules.mak |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE busybox-1.1.1-ppc64.patch ---
--- busybox-1.1.1/Rules.mak.pom	2006-03-22 22:16:26.000000000 +0100
+++ busybox-1.1.1/Rules.mak	2006-04-28 14:39:17.000000000 +0200
@@ -48,7 +48,7 @@
 
 # Select the compiler needed to build binaries for your development system
 HOSTCC    = gcc
-HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -mminimal-toc
 
 # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
 LC_ALL:= C


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- busybox.spec	6 Apr 2006 12:21:29 -0000	1.33
+++ busybox.spec	28 Apr 2006 13:08:40 -0000	1.34
@@ -10,6 +10,7 @@
 Patch1: busybox-1.1.1-anaconda.patch
 Patch2: busybox-1.1.1-selinux.patch
 Patch3: busybox-1.1.1-cve-2006-1058.patch
+Patch4: busybox-1.1.1-ppc64.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -38,10 +39,13 @@
 %patch2 -b .selinux -p1
 %patch -b .static -p1
 %patch3 -b .cve-2006-1058 -p1
+%ifarch ppc64
+%patch4 -b .ppc64 -p1
+%endif
 
 %build
 make defconfig
-make 
+make CC="gcc $RPM_OPT_FLAGS"
 cp busybox busybox-static
 make clean
 
@@ -52,7 +56,7 @@
 
 patch -b --suffix .anaconda -p1 < %{PATCH1}
 make DOLFS=y defconfig
-make CONFIG_DEBUG=y
+make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,10 +79,12 @@
 /sbin/busybox.anaconda
 
 %changelog
-* Wed Apr  6 2006 Ivana Varekova <varekova at redhat.com> - 1:1.1.1-1
+* Wed Apr  28 2006 Ivana Varekova <varekova at redhat.com> - 1:1.1.1-1
 - update to 1.1.1
 - fix CVE-2006-1058 - BusyBox passwd command 
   fails to generate password with salt (#187386)
+- add RPM_OPT_FLAGS
+- add -minimal-toc option
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.01-2.2.1
 - bump again for double-long bug on ppc(64)