Fix compilation with --as-needed

5 files changed, 66 insertions, 15 deletions

diff --git a/dev-embedded/scratchbox2/ChangeLog b/dev-embedded/scratchbox2/ChangeLog
index 345cba365c0c..1186c5d6c792 100644
--- a/dev-embedded/scratchbox2/ChangeLog
+++ b/dev-embedded/scratchbox2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/scratchbox2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox2/ChangeLog,v 1.3 2009/12/12 09:36:19 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox2/ChangeLog,v 1.4 2009/12/12 09:58:58 ayoy Exp $
+
+  12 Dec 2009; Dominik Kapusta <ayoy@gentoo.org> scratchbox2-2.0-r1.ebuild,
+  +files/scratchbox2-2.0-as-needed.patch,
+  files/scratchbox2-2.0-gentoo.patch:
+  Fix compilation with --as-needed
 
 *scratchbox2-2.0-r1 (12 Dec 2009)
 
diff --git a/dev-embedded/scratchbox2/Manifest b/dev-embedded/scratchbox2/Manifest
index db84402ae2dc..836c5bc25fb7 100644
--- a/dev-embedded/scratchbox2/Manifest
+++ b/dev-embedded/scratchbox2/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX scratchbox2-2.0-gentoo.patch 2328 RMD160 67fc03b7a9207dd0cba92884eff3df5df1bccd07 SHA1 1866ae620485f536ce2d1abc2d2c956ac021f019 SHA256 73e21123006f1a5cc20924f19b107a69e35d118b38c26ef3e5c1499f95bb73c9
+AUX scratchbox2-2.0-as-needed.patch 830 RMD160 72035464123291b3b89ab49e5cf46e8e06c9ece4 SHA1 af63a87d8607ccdad09246eff78f49a1448eda3e SHA256 50b4ea87621e422c8b397773d8bddb12b4e6149b7ab94f2bd31568d20f996fed
+AUX scratchbox2-2.0-gentoo.patch 3371 RMD160 9f2b244974bd3924e0125ea7a41293845ae95206 SHA1 292b24f70317eec73c07020bf6ef3c8f251dfcea SHA256 7feda97744684ed591a4d80139e7a769d6aab27243f71f67569760d4c0a2b753
 AUX scratchbox2-2.0-glibc-2.10.patch 1452 RMD160 40e1dc98ba5ebe69e748609a97662150f6a4f823 SHA1 07d7e0ffaf676cdbce4e9f4bf670cac1f067f130 SHA256 e01f526beae876d6335dd231a1cd7cc8a28cdbbdd0799e6e66dcab48f4998d9d
 AUX scratchbox2-2.0-use-system-lua.patch 2935 RMD160 0716ad3000ffad83af29c6b80f65491751d37497 SHA1 766fa3df6a1ef864868945ecae0a4449b899a086 SHA256 7c94845f98672d8fef51b7996db886d8888790b88d72732b103dcfa678dd2694
 DIST sbox2-2.0.tar.bz2 371402 RMD160 20399753b66edc1c8b2731a87327ed6b8c5d26c3 SHA1 6d5ac248a071d222ed28c7ea42bad00d3be7efc8 SHA256 bafabe2dcce1be57b494f91bbf4a6fde3f624434fe04a1fcd74acc54a1a5ccc1
-EBUILD scratchbox2-2.0-r1.ebuild 1504 RMD160 fbe5b2d7131944359f0e9e5a32d72b8c0d53ad98 SHA1 821b34186ee235008de7be4e9d14cb79416d5e0b SHA256 f6be9cc17295963ab561474f1fc2dcb7827e32781ef7c483d8d0e1eaa87ae362
-MISC ChangeLog 834 RMD160 8dce874b9bee629b7ad08a884dfb86c882bdf895 SHA1 24a90e6bf098973e7e2451df3f1e16dc07c3db5a SHA256 27e1d7aea6b03908d4024f8573ab4d3c94b7346c6fe604e7bbc3f6cfffdbfca4
+EBUILD scratchbox2-2.0-r1.ebuild 1561 RMD160 69ae3d65b00e0d155842b60c5b9a1944293ff36e SHA1 f336994e1df78a5c9261c0af32373992c5a5feac SHA256 ea965543e7fbe8c79e5dd3200df5c17b3c993b3710bc4dc38222170937fda220
+MISC ChangeLog 1026 RMD160 831082c4518db933d26c997747c8ce2976dfe4c8 SHA1 0458eeaf90d416259b0e4481c13e4d93793a45e2 SHA256 ab842c03e3449bdc1d3d1d386f6b177cf280bf07678471d58c06336538cba4be
 MISC metadata.xml 309 RMD160 54e8d81968ef8a15b061624dd684b047a1d31440 SHA1 3604f1bbd422e2e5c8024e8202a3ed87871e4beb SHA256 152493d68fa5bf5872e6ef9ee368506f0d58de5e6e17bb6fab8e2c55c2050fe5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAksjZBwACgkQ+CZEqwt+F6ZAjQCfcthcCr6cHIjZDO/z2W6PGnE5
-c4sAn1aFBOIb2UId90Y0N1M42hdWKFSJ
-=caeH
------END PGP SIGNATURE-----
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-as-needed.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-as-needed.patch
new file mode 100644
index 000000000000..eaffc158f9f2
--- /dev/null
+++ b/dev-embedded/scratchbox2/files/scratchbox2-2.0-as-needed.patch
@@ -0,0 +1,22 @@
+diff --git a/utils/Makefile b/utils/Makefile
+index cf9b6c4..6f715d3 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -6,7 +6,7 @@ $(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W -Werror \
+ 		-I$(SRCDIR)/include
+ 
+ $(D)/sb2-show.o: preload/exported.h
+-$(D)/sb2-show: preload/libsb2.$(SHLIBEXT) $(D)/sb2-show.o
++$(D)/sb2-show: $(D)/sb2-show.o preload/libsb2.$(SHLIBEXT)
+ 	$(MKOUTPUTDIR)
+ 	$(P)LD
+ 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+@@ -25,7 +25,7 @@ $(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W -Werror \
+ 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
+ 		-I$(SRCDIR)/include
+ 
+-$(D)/sb2-interp-wrapper: preload/libsb2.$(SHLIBEXT) $(D)/sb2-interp-wrapper.o
++$(D)/sb2-interp-wrapper: $(D)/sb2-interp-wrapper.o preload/libsb2.$(SHLIBEXT)
+ 	$(MKOUTPUTDIR)
+ 	$(P)LD
+ 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch
index e762c7dd5778..32dcdd1e2e36 100644
--- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch
+++ b/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch
@@ -55,3 +55,34 @@ index 23a13b3..c5b26cc 100644
  	$(P)INSTALL
  	@if [ -d $(multilib_prefix)/lib$(bitness) ] ; \
  	then echo "$(prefix)/lib$(bitness) present" ; \
+diff --git a/utils/Makefile b/utils/Makefile
+index cf9b6c4..79304fc 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -1,7 +1,7 @@
+ # beware of namespace collisions, all subdir makefiles are included
+ # into the top-level Makefile
+ 
+-$(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W -Werror \
++$(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W \
+ 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
+ 		-I$(SRCDIR)/include
+ 
+@@ -12,7 +12,7 @@ $(D)/sb2-show: preload/libsb2.$(SHLIBEXT) $(D)/sb2-show.o
+ 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ 
+-$(D)/sb2-monitor: CFLAGS := $(CFLAGS) -Wall -W -Werror \
++$(D)/sb2-monitor: CFLAGS := $(CFLAGS) -Wall -W \
+ 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
+ 		-I$(SRCDIR)/include
+ 
+@@ -21,7 +21,7 @@ $(D)/sb2-monitor: $(D)/sb2-monitor.o
+ 	$(P)LD
+ 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+-$(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W -Werror \
++$(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W \
+ 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
+ 		-I$(SRCDIR)/include
+ 
diff --git a/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild b/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild
index 0003182f49a8..f52f733bdf9e 100644
--- a/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild
+++ b/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild,v 1.1 2009/12/12 09:36:19 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild,v 1.2 2009/12/12 09:58:58 ayoy Exp $
 
 EAPI="2"
 
@@ -28,6 +28,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	# bug 296552
 	epatch "${FILESDIR}/${P}-use-system-lua.patch"
+	# bug 296550
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 
 	sed -e "s/^\(CC = \).*/\1$(tc-getCC)/" \
 		-e "s/^\(CXX = \).*/\1$(tc-getCXX)/" \