Patch which fixes build for forced as-needed. Bug #278086

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 264 insertions, 7 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index f19fca19e32a..207703574f1e 100644
--- a/app-editors/mp/ChangeLog
+++ b/app-editors/mp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/mp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.71 2010/05/29 19:34:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.72 2010/06/20 16:18:13 hwoarang Exp $
+
+  20 Jun 2010; Markos Chandras <hwoarang@gentoo.org> mp-5.1.1.ebuild,
+  +files/mp-5.1.1-asneeded.patch:
+  Patch which fixes build for forced as-needed. Bug #278086
 
   29 May 2010; Raúl Porcel <armin76@gentoo.org> mp-5.1.1.ebuild:
   Add ~alpha/~ia64/~sparc
diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
index a246aa05cdab..6767c070e9b4 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -1,6 +1,7 @@
+AUX mp-5.1.1-asneeded.patch 7946 RMD160 41cbf06311efdfed99aec9dd6b94bd5fbe89eb85 SHA1 5ae8e4a4b28eb6f09adb4b199d6597db1aeb15a2 SHA256 7c045cf8ae121b819e0866c60dad304f5fed12eb28905b056aa5012fb1dc5140
 DIST mp-3.3.18b.tar.gz 295661 RMD160 37b52db182035243504cd49acd4ee5dc2668e744 SHA1 5233b6481e654c8a096412ba9dacc7ae7de5900f SHA256 dabe00cbe8f0cb18a42c46242659265507b73c6862030dd63a22ed26738f9649
 DIST mp-5.1.1.tar.gz 426154 RMD160 7a50eddd997f51baeaafb79d65fc1b0137d274e1 SHA1 75fa481518be29f63ef35b152ab18acb3bd445d2 SHA256 1357a22e11cb2b1a44081cdd43c402489169b6d98aec4f736f2e7fc7be1615ee
 EBUILD mp-3.3.18b.ebuild 1574 RMD160 5b09b5a40af8d25c2344a02b363c5cae3430daca SHA1 f3c29c7c4eb23c6e41750501d557eef61dbc1834 SHA256 a7e6a7b3ae9d5b7cd52ff43da2b54acf257794a79747705ac95b753d14aad0d3
-EBUILD mp-5.1.1.ebuild 1704 RMD160 2fe1f38540caf6bbb4e47b625de6ca016645ee3c SHA1 82b3134121e122c093ef27707975b5abfe16c10b SHA256 2da7247a7997604a2a28b32a4e8aedf457f3536dd82dd736ef06faf304fdabeb
-MISC ChangeLog 8705 RMD160 ef1b0fc1ed5ad97900c564ad9f1b30ea4d5f5c67 SHA1 f68a03ca8cb129a20ab8445d038698de0473bf3c SHA256 12bb89c9329947baf5fe7754f37cb353e8b24e301e7479b3254776320936e8b9
+EBUILD mp-5.1.1.ebuild 1863 RMD160 bec1bfc9132289bddccb41eb6ef23cf7b1d9423d SHA1 ee94e1cca66eaeb64384b98fc76cb261c68b6435 SHA256 45ebbec0028d9a6d721284ab7507bd3fc35318f0fe35a6f5d137a0f69cd9d774
+MISC ChangeLog 8871 RMD160 ca1764ff9b98a6113beb06f367687096195cdbd3 SHA1 cba91b9171bfb9139849730861e9d214d78058fa SHA256 91bb56fab7580bf32e5a1df674a10139e650bf5d356fb4f37ab2f397e2b6fec3
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
diff --git a/app-editors/mp/files/mp-5.1.1-asneeded.patch b/app-editors/mp/files/mp-5.1.1-asneeded.patch
new file mode 100644
index 000000000000..6135ddd0bbbf
--- /dev/null
+++ b/app-editors/mp/files/mp-5.1.1-asneeded.patch
@@ -0,0 +1,245 @@
+Index: mp-5.1.1/config.sh
+===================================================================
+--- mp-5.1.1.orig/config.sh
++++ mp-5.1.1/config.sh
+@@ -75,7 +75,7 @@ echo "Configuring..."
+ 
+ echo "/* automatically created by config.sh - do not modify */" > config.h
+ echo "# automatically created by config.sh - do not modify" > makefile.opts
+-> config.ldflags
++> config.libs
+ > config.cflags
+ > .config.log
+ 
+@@ -129,7 +129,7 @@ done
+ 
+ if [ "$MPDM" != "NOTFOUND" ] ; then
+ 	echo "-I$MPDM" >> config.cflags
+-	echo "-L$MPDM -lmpdm" >> config.ldflags
++	echo "-L$MPDM -lmpdm" >> config.libs
+ 	echo "OK ($MPDM)"
+ else
+ 	echo "No"
+@@ -141,7 +141,7 @@ if [ ! -f $MPDM/Makefile ] ; then
+ 	( echo ; cd $MPDM ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
+ fi
+ 
+-cat $MPDM/config.ldflags >> config.ldflags
++cat $MPDM/config.libs >> config.libs
+ echo "MPDM=$MPDM" >> makefile.opts
+ 
+ # MPSL
+@@ -155,7 +155,7 @@ done
+ 
+ if [ "$MPSL" != "NOTFOUND" ] ; then
+ 	echo "-I$MPSL" >> config.cflags
+-	echo "-L$MPSL -lmpsl" >> config.ldflags
++	echo "-L$MPSL -lmpsl" >> config.libs
+ 	echo "OK ($MPSL)"
+ else
+ 	echo "No"
+@@ -167,7 +167,7 @@ if [ ! -f $MPSL/Makefile ] ; then
+ 	( echo ; cd $MPSL ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
+ fi
+ 
+-cat $MPSL/config.ldflags >> config.ldflags
++cat $MPSL/config.libs >> config.libs
+ echo "MPSL=$MPSL" >> makefile.opts
+ 
+ # Win32
+@@ -179,7 +179,7 @@ else
+ 	grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null
+ 
+ 	if [ $? = 0 ] ; then
+-		echo "-mwindows -lcomctl32" >> config.ldflags
++		echo "-mwindows -lcomctl32" >> config.libs
+ 		echo "#define CONFOPT_WIN32 1" >> config.h
+ 		echo "OK"
+ 		DRIVERS="win32 $DRIVERS"
+@@ -210,7 +210,7 @@ else
+ 	if [ $? = 0 ] ; then
+ 		echo "#define CONFOPT_CURSES 1" >> config.h
+ 		echo $TMP_CFLAGS >> config.cflags
+-		echo $TMP_LDFLAGS >> config.ldflags
++		echo $TMP_LDFLAGS >> config.libs
+ 		echo "OK (ncursesw)"
+ 		DRIVERS="ncursesw $DRIVERS"
+ 		DRV_OBJS="mpv_curses.o $DRV_OBJS"
+@@ -263,7 +263,7 @@ else
+ 		TMP_CFLAGS="$TMP_CFLAGS -I`kde4-config --install include`KDE"
+ 
+ 		TMP_LDFLAGS=$(pkg-config --libs QtCore)
+-		TMP_LDFLAGS="$TMP_LDFLAGS -L`kde4-config --install lib` -lkfile -lkdeui -lkdecore"
++		TMP_LDFLAGS="$TMP_LDFLAGS -L`kde4-config --install lib` -lkfile -lkdeui -lkdecore -lkio"
+ 
+ 		echo "#include <KApplication>" > .tmp.cpp
+ 		echo "int main(void) { new KApplication() ; return 0; } " >> .tmp.cpp
+@@ -273,7 +273,7 @@ else
+ 
+ 		if [ $? = 0 ] ; then
+ 			echo $TMP_CFLAGS >> config.cflags
+-			echo $TMP_LDFLAGS >> config.ldflags
++			echo $TMP_LDFLAGS >> config.libs
+ 
+ 			echo "#define CONFOPT_KDE4 1" >> config.h
+ 			echo "OK"
+@@ -311,7 +311,7 @@ else
+ 	if [ $? = 0 ] ; then
+ 		echo "#define CONFOPT_GTK 2" >> config.h
+ 		echo "$TMP_CFLAGS " >> config.cflags
+-		echo "$TMP_LDFLAGS " >> config.ldflags
++		echo "$TMP_LDFLAGS " >> config.libs
+ 		echo "OK (2.0)"
+ 		DRIVERS="gtk $DRIVERS"
+ 		DRV_OBJS="mpv_gtk.o $DRV_OBJS"
+Index: mp-5.1.1/makefile.in
+===================================================================
+--- mp-5.1.1.orig/makefile.in
++++ mp-5.1.1/makefile.in
+@@ -35,7 +35,7 @@ dep:
+ 	gcc -MM *.c `cat config.cflags` > makefile.depend
+ 
+ $(APPNAME): $(OBJS) $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a
+-	$(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` -o $@
++	$(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` `cat config.libs` -o $@
+ 
+ mpv_kde4.o: mpv_kde4.cpp mpv_kde4.moc
+ 	$(CPP) $(CFLAGS) -I. `cat config.cflags` -c $<
+@@ -47,7 +47,7 @@ mp_res.o: mp_res.rc
+ 	$(WINDRES) mp_res.rc mp_res.o
+ 
+ wmp.exe: $(OBJS) mp_res.o $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a
+-	$(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` -o $@
++	$(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` `cat config.libs` -o $@
+ 
+ clean:
+ 	rm -f $(APPNAME) $(LIB) $(OBJS) *.o *.moc tags *.tar.gz *.exe *.zip .installer.c *.1
+@@ -55,7 +55,7 @@ clean:
+ 	(cd $(MPSL) ; make clean)
+ 
+ distclean: clean
+-	rm -f config.h config.cflags config.ldflags \
++	rm -f config.h config.cflags config.ldflags config.libs \
+ 		makefile.opts Makefile po/minimum-profit.pot
+ 
+ docsclean:
+Index: mp-5.1.1/mpdm/config.sh
+===================================================================
+--- mp-5.1.1.orig/mpdm/config.sh
++++ mp-5.1.1/mpdm/config.sh
+@@ -70,7 +70,7 @@ echo "Configuring MPDM..."
+ 
+ echo "/* automatically created by config.sh - do not modify */" > config.h
+ echo "# automatically created by config.sh - do not modify" > makefile.opts
+-> config.ldflags
++> config.libs
+ > config.cflags
+ > .config.log
+ 
+@@ -169,7 +169,7 @@ if [ "$WITH_PCRE" = 1 ] ; then
+ 		echo "OK (using pcre library)"
+ 		echo "#define CONFOPT_PCRE 1" >> config.h
+ 		echo "$TMP_CFLAGS " >> config.cflags
+-		echo "$TMP_LDFLAGS " >> config.ldflags
++		echo "$TMP_LDFLAGS " >> config.libs
+ 		REGEX_YET=1
+ 	fi
+ fi
+@@ -316,7 +316,7 @@ else
+ 		if [ $? = 0 ] ; then
+ 			echo "OK (libintl needed)"
+ 			echo "#define CONFOPT_GETTEXT 1" >> config.h
+-			echo "$TMP_LDFLAGS" >> config.ldflags
++			echo "$TMP_LDFLAGS" >> config.libs
+ 		else
+ 			echo "No"
+ 		fi
+@@ -349,7 +349,7 @@ else
+ 		if [ $? = 0 ] ; then
+ 			echo "OK (libiconv needed)"
+ 			echo "#define CONFOPT_ICONV 1" >> config.h
+-			echo "$TMP_LDFLAGS" >> config.ldflags
++			echo "$TMP_LDFLAGS" >> config.libs
+ 		else
+ 			echo "No"
+ 		fi
+Index: mp-5.1.1/mpdm/makefile.in
+===================================================================
+--- mp-5.1.1.orig/mpdm/makefile.in
++++ mp-5.1.1/mpdm/makefile.in
+@@ -32,7 +32,7 @@ $(LIB): $(OBJS)
+ 	$(AR) rv $(LIB) $(OBJS)
+ 
+ stress: stress.c $(LIB)
+-	$(CC) $(CFLAGS) `cat config.ldflags` stress.c -L. -lmpdm -o $@
++	$(CC) $(CFLAGS) `cat config.ldflags` `cat config.libs` stress.c -L. -lmpdm -o $@
+ 
+ .SUFFIXES: .txt .html
+ 
+@@ -54,7 +54,7 @@ clean:
+ 	rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress
+ 
+ distclean: clean
+-	rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile
++	rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile
+ 
+ realclean: distclean docsclean
+ 
+Index: mp-5.1.1/mpsl/config.sh
+===================================================================
+--- mp-5.1.1.orig/mpsl/config.sh
++++ mp-5.1.1/mpsl/config.sh
+@@ -69,7 +69,7 @@ echo "Configuring MPSL..."
+ 
+ echo "/* automatically created by config.sh - do not modify */" > config.h
+ echo "# automatically created by config.sh - do not modify" > makefile.opts
+-> config.ldflags
++> config.libs
+ > config.cflags
+ > .config.log
+ 
+@@ -131,7 +131,7 @@ done
+ 
+ if [ "$MPDM" != "NOTFOUND" ] ; then
+ 	echo "-I$MPDM" >> config.cflags
+-	echo "-L$MPDM -lmpdm" >> config.ldflags
++	echo "-L$MPDM -lmpdm" >> config.libs
+ 	echo "OK ($MPDM)"
+ else
+ 	echo "No"
+@@ -143,7 +143,7 @@ if [ ! -f $MPDM/Makefile ] ; then
+ 	( echo ; cd $MPDM ; ./config.sh $CONF_ARGS ; echo )
+ fi
+ 
+-cat $MPDM/config.ldflags >> config.ldflags
++cat $MPDM/config.libs >> config.libs
+ 
+ # if win32, the interpreter is called mpsl.exe
+ grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null && TARGET=mpsl.exe
+Index: mp-5.1.1/mpsl/makefile.in
+===================================================================
+--- mp-5.1.1.orig/mpsl/makefile.in
++++ mp-5.1.1/mpsl/makefile.in
+@@ -49,11 +49,11 @@ $(LIB): $(OBJS)
+ 	$(AR) rv $(LIB) $(OBJS)
+ 
+ $(TARGET): $(LIB) $(MPDM)/libmpdm.a
+-	$(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` -o $@
++	$(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@
+ 
+ stress: stress.c $(LIB) $(MPDM)/libmpdm.a
+ 	$(CC) $(CFLAGS) `cat config.cflags` stress.c \
+-		-L. -lmpsl `cat config.ldflags` -o $@
++		-L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@
+ 
+ clean:
+ 	rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress
+@@ -62,7 +62,7 @@ realclean: clean
+ 	rm -f y.tab.c y.tab.h lex.yy.c
+ 
+ distclean: clean y.tab.c y.tab.h lex.yy.c
+-	rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile
++	rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile
+ 
+ realclean: distclean docsclean
+ 
diff --git a/app-editors/mp/mp-5.1.1.ebuild b/app-editors/mp/mp-5.1.1.ebuild
index fa304b196400..3d25c60f4f00 100644
--- a/app-editors/mp/mp-5.1.1.ebuild
+++ b/app-editors/mp/mp-5.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.5 2010/05/29 19:34:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.6 2010/06/20 16:18:13 hwoarang Exp $
 
 EAPI="3"
 
@@ -27,6 +27,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-lang/perl"
 
+src_prepare() {
+	# fix force as-needed wrt bug #278086
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
 src_configure() {
 	local myconf="--prefix=${EPREFIX}/usr --without-win32"
 
@@ -43,10 +48,12 @@ src_configure() {
 
 	use iconv || myconf="${myconf} --without-iconv"
 
-	sh config.sh ${myconf} || die "Configure failed"
+	for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
+		echo ${CFLAGS} >> $i/config.cflags
+		echo ${LDFLAGS} >> $i/config.ldflags
+	done
 
-	echo ${CFLAGS} >> config.cflags
-	echo ${LDFLAGS} >> config.ldflags
+	sh config.sh ${myconf} || die "Configure failed"
 }
 
 src_install() {