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

(Portage version: 2.1.2_rc4-r7)

4 files changed, 197 insertions, 4 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/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() {