Fix building with -Wl,--as-needed and breaking on errors, see bugs #136489 and #160673.

Package-Manager: portage-2.1.2_rc4-r7

5 files changed, 217 insertions, 16 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index d8e3d62a56e3..ba1ba55ee37f 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fltk
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.75 2006/11/15 11:46:20 nelchael Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.76 2007/01/08 21:29:08 nelchael Exp $
+
+  08 Jan 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/fltk-1.1.7-as-needed.patch, +files/fltk-1.1.7-dieonerrors.patch,
+  fltk-1.1.7.ebuild:
+  Fix building with -Wl,--as-needed and breaking on errors, see bugs #136489
+  and #160673.
 
   15 Nov 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/fltk-1.1.7-amd64.patch, fltk-1.1.7.ebuild:
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 085ab40cf87a..299bcd3f4ade 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -5,19 +5,27 @@ AUX fltk-1.1.7-amd64.patch 2433 RMD160 fb625474ff36b75a35394862b45653c30c6728e5
 MD5 1f3423427a6ce99b42ffb62c19b1c45d files/fltk-1.1.7-amd64.patch 2433
 RMD160 fb625474ff36b75a35394862b45653c30c6728e5 files/fltk-1.1.7-amd64.patch 2433
 SHA256 25619bc596b59824d4e5737b0796f2e79ea6f2ca1dc4aabaa69702be1bf80e10 files/fltk-1.1.7-amd64.patch 2433
+AUX fltk-1.1.7-as-needed.patch 4767 RMD160 5f2b64450cd2347b9357799f5ddb32084e913b7a SHA1 90e819e5f1dd577a33e818dab4ef24f623bbf06d SHA256 c19b73f1fd75d1a38df958577c5288f6b10cad64e9fb7b54e6b0ffef57f88772
+MD5 c04de4b69bbde2f94cd3bfa54c8be70a files/fltk-1.1.7-as-needed.patch 4767
+RMD160 5f2b64450cd2347b9357799f5ddb32084e913b7a files/fltk-1.1.7-as-needed.patch 4767
+SHA256 c19b73f1fd75d1a38df958577c5288f6b10cad64e9fb7b54e6b0ffef57f88772 files/fltk-1.1.7-as-needed.patch 4767
+AUX fltk-1.1.7-dieonerrors.patch 1309 RMD160 9a34d91d3ad2407eaa79a825e1c9a6c3ab8310d3 SHA1 e54c72d4c40adf51e1cf8a7ce1886dffbfa0c1fd SHA256 88f8a1cf1fe4d981d2b1a1d263d57907c214c24041264fb37e04abe28792280b
+MD5 210f6c3b3119c655d96e07debc3455a4 files/fltk-1.1.7-dieonerrors.patch 1309
+RMD160 9a34d91d3ad2407eaa79a825e1c9a6c3ab8310d3 files/fltk-1.1.7-dieonerrors.patch 1309
+SHA256 88f8a1cf1fe4d981d2b1a1d263d57907c214c24041264fb37e04abe28792280b files/fltk-1.1.7-dieonerrors.patch 1309
 AUX libs-1.7.diff 960 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 SHA1 136301dbfa9b9a3dc5cad303b53b79c019c942c8 SHA256 bd95ae19749cdeb04701ff91cc97e5c6c4b7bad5c9d07a80af02d98f01d88330
 MD5 29c93504c8cba00eee5622ecbf61f134 files/libs-1.7.diff 960
 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 files/libs-1.7.diff 960
 SHA256 bd95ae19749cdeb04701ff91cc97e5c6c4b7bad5c9d07a80af02d98f01d88330 files/libs-1.7.diff 960
 DIST fltk-1.1.7-source.tar.bz2 2060757 RMD160 a539a1c6bb3363e54bc82c7995037c5d8ede9dd7 SHA1 16b174522920403af1e4ccddd36daaefda3765c8 SHA256 855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a
-EBUILD fltk-1.1.7.ebuild 2545 RMD160 2e33db560059c1f40556578fc33b1aa7a22c9d28 SHA1 457f7d5d4e1df596c2ace3580c36d2da084dcd37 SHA256 ee6780b7fb411f2a877f7c52f1adf368bb36b56bf0cf7652c851e2e838c158bb
-MD5 5be54aa3f202af98a32dfbb2a8fb0522 fltk-1.1.7.ebuild 2545
-RMD160 2e33db560059c1f40556578fc33b1aa7a22c9d28 fltk-1.1.7.ebuild 2545
-SHA256 ee6780b7fb411f2a877f7c52f1adf368bb36b56bf0cf7652c851e2e838c158bb fltk-1.1.7.ebuild 2545
-MISC ChangeLog 10003 RMD160 a58a4cf6b3cd208363aafeebeb9ef9b288a290ab SHA1 e1972c5c467a1c42fd352f99d0de9f5b69bc03e3 SHA256 ebe92ec0b3d438aa25db76ddb34e9707651854d168a6f232e970ead84028c207
-MD5 40096022f33bf3d8a9f6c5517cacec09 ChangeLog 10003
-RMD160 a58a4cf6b3cd208363aafeebeb9ef9b288a290ab ChangeLog 10003
-SHA256 ebe92ec0b3d438aa25db76ddb34e9707651854d168a6f232e970ead84028c207 ChangeLog 10003
+EBUILD fltk-1.1.7.ebuild 2633 RMD160 006d6221a7f774ce603e662667beb9f212d70511 SHA1 52763786e6668e2999146bc3cfc76cb360095b10 SHA256 04fcebd82ea8297ab4d237801fbc88d36c3858fe3bd1d154ac45254d439a2dc4
+MD5 de5fdf75ed78168ebdef3bfdf9124553 fltk-1.1.7.ebuild 2633
+RMD160 006d6221a7f774ce603e662667beb9f212d70511 fltk-1.1.7.ebuild 2633
+SHA256 04fcebd82ea8297ab4d237801fbc88d36c3858fe3bd1d154ac45254d439a2dc4 fltk-1.1.7.ebuild 2633
+MISC ChangeLog 10244 RMD160 1a5ec27d73357de1a0ebf29eab437a6e2025aa72 SHA1 d4586c01885f7031e277a2d270e100b2ebc356a0 SHA256 0f8941f63978d97b98eb219621104384ba5c250f9a8e2bf1aba1073ae3254564
+MD5 d333a89808cead6f01c9eef542f77a1c ChangeLog 10244
+RMD160 1a5ec27d73357de1a0ebf29eab437a6e2025aa72 ChangeLog 10244
+SHA256 0f8941f63978d97b98eb219621104384ba5c250f9a8e2bf1aba1073ae3254564 ChangeLog 10244
 MISC metadata.xml 314 RMD160 24115a7758bbd2c07da47a2ffe4b79bc31cefa59 SHA1 1a4ff85c48bc39f8fac4fafc8ae06c34a290bab2 SHA256 91972db8a2f941249874f23c38338b0c7aa06cc29802074571a3582fb5269516
 MD5 aeb16984ffc07732d37c5974c14f28de metadata.xml 314
 RMD160 24115a7758bbd2c07da47a2ffe4b79bc31cefa59 metadata.xml 314
@@ -26,9 +34,9 @@ MD5 b91980ec72860ef3acc1a9256d24aa96 files/digest-fltk-1.1.7 259
 RMD160 d7c0cd6b9f600e0c120baae3f417368b27eb7e09 files/digest-fltk-1.1.7 259
 SHA256 613c60277ccfb5adef1c1a6e37c073066872fcf368b663f2ee04193ee1821276 files/digest-fltk-1.1.7 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFWv4dgo/w9rxVVVERAqszAKCq6iqy/sWU5FvRSDDZ9lUcoe5ipQCfbGib
-T0hZedTZheKLZvIQ3YBMbnU=
-=dobT
+iD8DBQFForfjgo/w9rxVVVERAm/kAJ0SiXHHAzyfpUcRuQkE8cvBumvO6wCgsU+Q
+5lWFrVznQJNXqbb8Ye0Totg=
+=zb9n
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/files/fltk-1.1.7-as-needed.patch b/x11-libs/fltk/files/fltk-1.1.7-as-needed.patch
new file mode 100644
index 000000000000..9e5305a0aa28
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.1.7-as-needed.patch
@@ -0,0 +1,139 @@
+--- fltk-1.1.7/configure.in.old	2006-11-12 14:30:49.000000000 +0100
++++ fltk-1.1.7/configure.in	2006-11-12 14:31:58.000000000 +0100
+@@ -171,7 +171,7 @@
+             FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
+             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
+             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
+-            DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
++            DSOCOMMAND="\$(CXX) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
+ 	    if test "x$libdir" != "x/usr/lib"; then
+ 		    DSOLINK="-Wl,-rpath,$libdir"
+             fi
+@@ -647,10 +647,9 @@
+ 	    AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
+ 	fi
+ 
+-	LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS"
++	LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS"
+ 	CFLAGS="$CFLAGS $X_CFLAGS"
+ 	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-	LDFLAGS="$X_LIBS $LDFLAGS"
+ 
+ 	if test "x$x_includes" != x; then
+ 	    ac_cpp="$ac_cpp -I$x_includes"
+--- fltk-1.1.7/makeinclude.in.old	2006-11-12 14:31:05.000000000 +0100
++++ fltk-1.1.7/makeinclude.in	2006-11-12 14:31:20.000000000 +0100
+@@ -74,8 +74,9 @@
+ 
+ # libraries to link with:
+ AUDIOLIBS	= @AUDIOLIBS@
+-LDLIBS		= @LDFLAGS@ @LIBS@
+-GLDLIBS		= @LDFLAGS@ @GLLIB@ @LIBS@
++LDFLAGS		= @LDFLAGS@
++LDLIBS		= @LIBS@
++GLDLIBS		= @GLLIB@ @LIBS@
+ LINKFLTK	= @LINKFLTK@
+ LINKFLTKGL	= @LINKFLTKGL@
+ LINKFLTKFORMS	= @LINKFLTKFORMS@ @LINKFLTK@
+--- fltk-1.1.7/src/Makefile.old	2006-11-12 15:30:11.000000000 +0100
++++ fltk-1.1.7/src/Makefile	2006-11-12 15:33:56.000000000 +0100
+@@ -202,13 +202,13 @@
+ 
+ libfltk.so.1.1: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(OBJECTS)
++	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
+ 	$(RM) libfltk.so
+ 	$(LN) libfltk.so.1.1 libfltk.so
+ 
+ libfltk.sl.1.1: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(OBJECTS)
++	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
+ 	$(RM) libfltk.sl
+ 	$(LN) libfltk.sl.1.1 libfltk.sl
+ 
+@@ -224,7 +224,7 @@
+ 
+ libfltk_s.a: $(OBJECTS)
+ 	echo $(DSOCOMMAND) libfltk_s.o ...
+-	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
++	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
+ 	echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
+ 	$(RM) $@
+ 	$(LIBCOMMAND) libfltk_s.a libfltk_s.o
+@@ -238,13 +238,13 @@
+ 
+ libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
++	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
+ 	$(RM) libfltk_forms.so
+ 	$(LN) libfltk_forms.so.1.1 libfltk_forms.so
+ 
+ libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
++	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
+ 	$(RM) libfltk_forms.sl
+ 	$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl
+ 
+@@ -260,7 +260,7 @@
+ 
+ libfltk_forms_s.a: $(FLOBJECTS)
+ 	echo $(DSOCOMMAND) libfltk_forms_s.o ...
+-	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
++	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
+ 	echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
+ 	$(RM) $@
+ 	$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
+@@ -274,13 +274,13 @@
+ 
+ libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
++	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
+ 	$(RM) libfltk_gl.so
+ 	$(LN) libfltk_gl.so.1.1 libfltk_gl.so
+ 
+ libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
++	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
+ 	$(RM) libfltk_gl.sl
+ 	$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl
+ 
+@@ -296,7 +296,7 @@
+ 
+ libfltk_gl_s.a: $(GLOBJECTS)
+ 	echo $(DSOCOMMAND) libfltk_gl_s.o ...
+-	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
++	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS)
+ 	echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
+ 	$(RM) $@
+ 	$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
+@@ -310,13 +310,13 @@
+ 
+ libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
++	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
+ 	$(RM) libfltk_images.so
+ 	$(LN) libfltk_images.so.1.1 libfltk_images.so
+ 
+ libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
++	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
+ 	$(RM) libfltk_images.sl
+ 	$(LN) libfltk_images.sl.1.1 libfltk_images.sl
+ 
+@@ -332,7 +332,7 @@
+ 
+ libfltk_images_s.a: $(IMGOBJECTS)
+ 	echo $(DSOCOMMAND) libfltk_images_s.o ...
+-	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
++	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
+ 	echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
+ 	$(RM) $@
+ 	$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
diff --git a/x11-libs/fltk/files/fltk-1.1.7-dieonerrors.patch b/x11-libs/fltk/files/fltk-1.1.7-dieonerrors.patch
new file mode 100644
index 000000000000..cde44099cc3d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.1.7-dieonerrors.patch
@@ -0,0 +1,46 @@
+--- Makefile.old	2007-01-07 14:03:38.000000000 +0100
++++ Makefile	2007-01-07 14:04:04.000000000 +0100
+@@ -32,7 +32,7 @@
+ all: makeinclude
+ 	for dir in $(DIRS); do\
+ 		echo "=== making $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
+ 	done
+ 
+ install: makeinclude
+@@ -42,7 +42,7 @@
+ 	-chmod 755 $(DESTDIR)$(bindir)/fltk-config
+ 	for dir in FL $(DIRS); do\
+ 		echo "=== installing $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
+ 	done
+ 
+ install-desktop: makeinclude
+@@ -54,7 +54,7 @@
+ 	$(RM) $(DESTDIR)$(bindir)/fltk-config
+ 	for dir in FL $(DIRS); do\
+ 		echo "=== uninstalling $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\
+ 	done
+ 
+ uninstall-desktop: makeinclude
+@@ -65,14 +65,14 @@
+ depend: makeinclude
+ 	for dir in $(DIRS); do\
+ 		echo "=== making dependencies in $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS) depend) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\
+ 	done
+ 
+ clean:
+ 	-$(RM) core *.o
+ 	for dir in $(DIRS); do\
+ 		echo "=== cleaning $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS) clean) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
+ 	done
+ 
+ distclean: clean
diff --git a/x11-libs/fltk/fltk-1.1.7.ebuild b/x11-libs/fltk/fltk-1.1.7.ebuild
index 7360e127c26b..cdcd2dc3b960 100644
--- a/x11-libs/fltk/fltk-1.1.7.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.11 2006/11/15 11:46:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.12 2007/01/08 21:29:08 nelchael Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -40,6 +40,8 @@ src_unpack() {
 	use amd64 && {
 		epatch "${FILESDIR}/${P}-amd64.patch" || die "patch failed"
 	}
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-dieonerrors.patch"
 }
 
 src_compile() {