Update busybox static-error patch to actually work

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@623 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index c5ffca9fc880c2985a59837765ea045432034657..a5acbd555f87b5b12b76188534f17527ce6e3516 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
+  patches/busybox/1.7.4/1.7.4-static-error.diff:
+  Update busybox static-error patch to actually work
+
   12 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.conf:
   Change BUSYBOX_VER to VERSION_BUSYBOX for genkernel-9999 ebuild.
 

diff --git a/patches/busybox/1.7.4/1.7.4-static-error.diff b/patches/busybox/1.7.4/1.7.4-static-error.diff
index e3c5405b8bd291d13bc3ef1fb7221fdf80a3b610..1e3b59c12c834014ad5af433b3deae93784a59a8 100644 (file)
--- a/patches/busybox/1.7.4/1.7.4-static-error.diff
+++ b/patches/busybox/1.7.4/1.7.4-static-error.diff
@@ -1,3 +1,4 @@
+diff -ur busybox-1.7.4.orig/applets/applets.c busybox-1.7.4/applets/applets.c
 --- busybox-1.7.4.orig/applets/applets.c       2007-09-16 13:48:10.000000000 -0500
 +++ busybox-1.7.4/applets/applets.c    2008-03-11 13:53:18.000000000 -0500
 @@ -23,7 +23,6 @@
@@ -8,3 +9,15 @@
  #endif
  
  
+diff -ur busybox-1.7.4.orig/Makefile busybox-1.7.4/Makefile
+--- busybox-1.7.4.orig/Makefile        2007-11-23 22:34:41.000000000 -0600
++++ busybox-1.7.4/Makefile     2008-03-12 06:35:25.000000000 -0500
+@@ -570,7 +570,7 @@
+ quiet_cmd_busybox__ ?= LINK    $@
+       cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \
+       -o $@ -Wl,-Map -Wl,$@.map \
+-      -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
++      -Wl,--warn-common -Wl,--sort-common  \
+       -Wl,--start-group $(busybox-all) -Wl,--end-group \
+       $(LDLIBS)
+