Fixed compilation problems with --as-needed (bug #178661)

(Portage version: 2.1.5.2)

3 files changed, 49 insertions, 4 deletions

diff --git a/dev-scheme/drscheme/ChangeLog b/dev-scheme/drscheme/ChangeLog
index 7395cb17849a..8b28f8c9bb2e 100644
--- a/dev-scheme/drscheme/ChangeLog
+++ b/dev-scheme/drscheme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/drscheme
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.58 2008/03/23 11:51:43 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.59 2008/06/03 10:19:12 dev-zero Exp $
+
+  03 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/drscheme-372-as_needed.patch, drscheme-372-r1.ebuild:
+  Fixed compilation problems with --as-needed (bug #178661)
 
 *drscheme-372-r1 (23 Mar 2008)
 
diff --git a/dev-scheme/drscheme/drscheme-372-r1.ebuild b/dev-scheme/drscheme/drscheme-372-r1.ebuild
index 5535127f9f8a..d11802ee7054 100644
--- a/dev-scheme/drscheme/drscheme-372-r1.ebuild
+++ b/dev-scheme/drscheme/drscheme-372-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-372-r1.ebuild,v 1.1 2008/03/23 11:51:43 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-372-r1.ebuild,v 1.2 2008/06/03 10:19:12 dev-zero Exp $
 
 inherit eutils latex-package
 
@@ -32,8 +32,14 @@ DEPEND="${RDEPEND} !dev-tex/slatex"
 S="${WORKDIR}/plt-${PV%%_p*}"
 
 src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," -i src/configure
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," \
+		src/configure || die "sed failed"
+
+	epatch "${FILESDIR}/${P}-as_needed.patch"
 }
 
 src_compile() {
diff --git a/dev-scheme/drscheme/files/drscheme-372-as_needed.patch b/dev-scheme/drscheme/files/drscheme-372-as_needed.patch
new file mode 100644
index 000000000000..2781c33a6cc0
--- /dev/null
+++ b/dev-scheme/drscheme/files/drscheme-372-as_needed.patch
@@ -0,0 +1,35 @@
+diff -Naur plt-372.orig/src/configure plt-372/src/configure
+--- plt-372.orig/src/configure	2008-06-01 15:25:38.000000000 +0200
++++ plt-372/src/configure	2008-06-01 15:32:21.000000000 +0200
+@@ -5390,6 +5390,7 @@
+   Linux)
+     LIBS="$LIBS -rdynamic"
+     DYN_CFLAGS="-fPIC"
++    LIBMZSCHEME_DEP="-ldl -lm"
+     # PPC: X11 librares are not found
+     case `$UNAME -m` in
+       ppc)
+diff -Naur plt-372.orig/src/mred/Makefile.in plt-372/src/mred/Makefile.in
+--- plt-372.orig/src/mred/Makefile.in	2008-06-01 15:25:37.000000000 +0200
++++ plt-372/src/mred/Makefile.in	2008-06-01 20:33:27.000000000 +0200
+@@ -125,7 +125,7 @@
+ 	$(MREDLINKER) $(MREDLDFLAGS) $(MRSTATIC) -o mred@CGC@ $(MREDOBJECTS) $(MREDLDLIBS) $(MRSTATIC_STUB)
+ 
+ libmred.@LIBSFX@: $(WXLIBSNORM)
+-	$(AR) $(ARFLAGS) libmred.@LIBSFX@ $(WXLIBSNORM) @LIBMRED_DEP@
++	$(AR) $(ARFLAGS) libmred.@LIBSFX@ $(WXLIBSNORM) @LIBMRED_DEP@ @LDFLAGS@ $(LDLIBS)
+ 
+ MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd
+ MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)/Resources/PLT_MrEd.rsrc
+diff -Naur plt-372.orig/src/mzscheme/gc2/Makefile.in plt-372/src/mzscheme/gc2/Makefile.in
+--- plt-372.orig/src/mzscheme/gc2/Makefile.in	2008-06-01 15:25:38.000000000 +0200
++++ plt-372/src/mzscheme/gc2/Makefile.in	2008-06-01 20:32:00.000000000 +0200
+@@ -310,7 +310,7 @@
+ EXTRA_OBJS_L = ../src/gmp.@LTO@ @FOREIGN_OBJSLIB_IF_USED@
+ 
+ ../libmzscheme3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T)
+-	$(AR) $(ARFLAGS) ../libmzscheme3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L)
++	$(AR) $(ARFLAGS) ../libmzscheme3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) @LDFLAGS@ $(LIBS)
+ 	$(RANLIB) ../libmzscheme3m.@LIBSFX@
+ 
+ ../mzscheme@MMM@@NOT_OSX@: main.@LTO@ ../libmzscheme3m.@LIBSFX@