Add patch to allow linking with --as-needed and removed filtering.

Package-Manager: portage-2529-svn

4 files changed, 150 insertions, 11 deletions

diff --git a/media-sound/mt-daapd/ChangeLog b/media-sound/mt-daapd/ChangeLog
index d312432985c1..a9dde0015d9b 100644
--- a/media-sound/mt-daapd/ChangeLog
+++ b/media-sound/mt-daapd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mt-daapd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.12 2006/01/12 16:17:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.13 2006/01/12 16:45:03 flameeyes Exp $
+
+  12 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mt-daapd-0.2.3-libsorder.patch, mt-daapd-0.2.3-r2.ebuild:
+  Add patch to allow linking with --as-needed and removed filtering.
 
   12 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> -mt-daapd-0.2.3.ebuild,
   -mt-daapd-0.2.3-r1.ebuild:
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
index 263ce77afc3d..e7e4faa6bedc 100644
--- a/media-sound/mt-daapd/Manifest
+++ b/media-sound/mt-daapd/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c9f6e2972873fc990fabcd6332652f4d ChangeLog 2456
+MD5 6ed8189e29f0b2c3d78d3a06106af4b1 ChangeLog 2646
 MD5 804311ec22b1fba76a61411d0c752a15 files/digest-mt-daapd-0.2.1.1 68
 MD5 a83c2c2bb548a45b8b1294e009aff64d files/digest-mt-daapd-0.2.3-r2 66
+MD5 55238544e58e1a12aa7a405779d03fb1 files/mt-daapd-0.2.3-libsorder.patch 5162
 MD5 40d97e03e85d347c0ddf88f5f07d4093 files/mt-daapd-0.2.3-persist-fix.patch 1182
 MD5 b6ec66b0ccfd69869025f1bba1421dd6 files/mt-daapd-0.2.3-pidfile.patch 1918
 MD5 227a3d186fe7904440caec11492341db files/mt-daapd-0.2.3-sparc.patch 927
@@ -11,11 +12,11 @@ MD5 d14aca83cf21b8c519b42962ba276e42 files/mt-daapd.init 540
 MD5 674db97976bcc4e34df95a17ffe8750c files/mt-daapd.init.2 1200
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 880127a188cf908b0ad84221e48eeebf mt-daapd-0.2.1.1.ebuild 1936
-MD5 83634acd6be56c2a8ce7668f5d54f9eb mt-daapd-0.2.3-r2.ebuild 3523
+MD5 4e20971d10008c86db9e602e3b738fa1 mt-daapd-0.2.3-r2.ebuild 3500
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDxoE3AiZjviIA2XgRAudBAKCOwKTlc1Lu+EmzZKkUD4Vu+6rQkgCdGtfh
-Ig2yZ39qIvcfkElPI+/9qO4=
-=Y7o2
+iD8DBQFDxoebAiZjviIA2XgRAqv/AKDuKOm5COAk6go++vSQgxbgSO4z0gCdH4ho
+v7v6QZwD57GojGJLIGK83Mk=
+=kqUS
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.3-libsorder.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.3-libsorder.patch
new file mode 100644
index 000000000000..ce1d83c38bd4
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.3-libsorder.patch
@@ -0,0 +1,134 @@
+This patch make sure that the libraries to link against are specified at the
+end of the linking commandline, instead of before any file, as that would
+ignore them altogether while using --as-needed. It make sure the libraries are
+passed in a more autotool-compliant way, too.
+
+Index: mt-daapd-0.2.3/configure.in
+===================================================================
+--- mt-daapd-0.2.3.orig/configure.in
++++ mt-daapd-0.2.3/configure.in
+@@ -20,8 +20,9 @@ STATIC_LIBS=no
+ CPPFLAGS="${CPPFLAGS} -g"
+ 
+ dnl fix freebsd's broken (?) libpthread
+-AC_CHECK_LIB(c_r,pthread_creat,LDFLAGS="${LDFLAGS} -lc_r", [
+-  AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="${LDFLAGS} -lpthread") ])
++AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [
++  AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ])
++AC_SUBST(THREAD_LIBS)
+ 
+ AC_ARG_ENABLE(debug,[  --enable-debug          Enable debugging features],
+ 		       CPPFLAGS="${CPPFLAGS} -Wall")
+@@ -35,17 +36,19 @@ AC_ARG_ENABLE(mdns,[  --enable-mdns     
+ 		      esac ])
+ 
+ AC_ARG_ENABLE(efence,[  --enable-efence         Enable electric fence],
+-			LDFLAGS="${LDFLAGS} -lefence")
++			EFENCE_LIBS="-lefence")
++AC_SUBST(EFENCE_LIBS)
+ AC_ARG_ENABLE(nslu2,[  --enable-nslu2          Build for NSLU2/uNSLUng], 
+ 		       CFLAGS="${CFLAGS} -DNSLU2")
+ 
+ AC_ARG_ENABLE(howl,[  --enable-howl       Use howl 0.9.2 or later],
+ 		      [ case "${enableval}" in
+-                        yes) rend_howl=true; rend_posix=false; LDFLAGS="${LDFLAGS} -lhowl";
++                        yes) rend_howl=true; rend_posix=false; HOWL_LIBS="-lhowl";
+ 			CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
+ 		        no)  rend_howl=false;;
+ 		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
+ 		      esac ])
++AC_SUBST(HOWL_LIBS)
+ 
+ AC_ARG_ENABLE(oggvorbis,[  --enable-oggvorbis      Enable Ogg/Vorbis support],
+                            use_oggvorbis=true;
+@@ -72,7 +75,7 @@ case $host in
+ 	CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
+ 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
+ 	CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+-	LDFLAGS="$LDFLAGS -lnsl -lsocket";;	
++	EXTRA_LIBS="$EXTRA_LIBS -lnsl -lsocket";;
+ *freebsd*)
+ 	CPPFLAGS="$CPPFLAGS -DFREEBSD";;
+ *linux*)
+@@ -88,6 +91,8 @@ case $host in
+ 	AM_CONDITIONAL(COND_REND_POSIX,false);;
+ esac
+ 
++AC_SUBST(EXTRA_LIBS)
++
+ dnl Checks for libraries.
+ AC_ARG_WITH(static-libs,
+ 	[--with-static-libs[[=DIR]]            use static libs in DIR],[
+@@ -144,12 +149,13 @@ AC_CHECK_HEADERS(gdbm.h,, [
+ AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
+ 
+ if test "$STATIC_LIBS" != "no"; then
+-  LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libgdbm.a"
++  GDBM_LIBS="${STATIC_LIBS}/libgdbm.a"
+   echo "Adding static libgdbm"
+ else
+-  LDFLAGS="${LDFLAGS} -lgdbm"
++  GDBM_LIBS="-lgdbm"
+   echo "Adding dynamic libgdbm"
+ fi
++AC_SUBST(GDBM_LIBS)
+ 
+ AC_CHECK_HEADERS(id3tag.h,, [
+  AC_MSG_ERROR([id3tag.h not found... try --with-id3tag=dir])])
+@@ -160,12 +166,13 @@ CFLAGS="$CFLAGS -lz"
+ AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
+ 
+ if test "$STATIC_LIBS" != "no"; then
+-  LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz"
++  ID3_LIBS="${STATIC_LIBS}/libid3tag.a -lz"
+   echo "Adding static libid3tag"
+ else
+-  LDFLAGS="${LDFLAGS} -lid3tag -lz"
++  ID3_LIBS="-lid3tag -lz"
+   echo "Adding dynamic libid3tag"
+ fi
++AC_SUBST([ID3_LIBS])
+ CFLAGS=$oldcflags
+ 
+ if test x$use_oggvorbis = xtrue; then
+@@ -174,22 +181,23 @@ if test x$use_oggvorbis = xtrue; then
+   AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a"
++    OGG_LIBS="${STATIC_LIBS}/libogg.a"
+     echo "Adding static libogg"
+   else
+-    LDFLAGS="${LDFLAGS} -logg"
++    OGG_LIBS="-logg"
+     echo "Adding dynamic libogg"
+   fi
++  AC_SUBST(OGG_LIBS)
+ 
+   AC_CHECK_HEADERS(vorbis/codec.h,, [
+    AC_MSG_ERROR([vorbis/codec.h not found... Must have libvorbis installed for Ogg/Vorbis support])])
+   AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a"
++    OGG_LIBS="${OGG_LIBS} ${STATIC_LIBS}/libvorbis.a"
+     echo "Adding static libvorbis"
+   else
+-    LDFLAGS="${LDFLAGS} -lvorbis"
++    OGG_LIBS="${OGG_LIBS} -lvorbis"
+     echo "Adding dynamic libvorbis"
+   fi
+ fi
+Index: mt-daapd-0.2.3/src/Makefile.am
+===================================================================
+--- mt-daapd-0.2.3.orig/src/Makefile.am
++++ mt-daapd-0.2.3/src/Makefile.am
+@@ -29,6 +29,8 @@ mt_daapd_SOURCES = main.c daapd.h rend.h
+ 	rend-unix.h lexer.l parser.y strcasestr.c strcasestr.h strsep.c \
+ 	redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \
+ 	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC)
++mt_daapd_LDADD = $(GDBM_LIBS) $(ID3_LIBS) $(OGG_LIBS) $(THREAD_LIBS) \
++	$(EFENCE_LIBS) $(HOWL_LIBS) $(EXTRA_LIBS)
+ 
+ EXTRA_DIST = mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c \
+ 	mDNSUNP.c mDNSPlatformFunctions.h mDNSPosix.h mDNSUNP.h \
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild
index 55260a0e2e47..d1509eda306d 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild,v 1.3 2006/01/04 15:10:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild,v 1.4 2006/01/12 16:45:03 flameeyes Exp $
 
-inherit flag-o-matic eutils
+inherit eutils autotools
 
 MY_P="${P/_/-}"
 
@@ -31,9 +31,6 @@ pkg_setup() {
 		eerror "Please recompile net-dns/avahi with +howl-compat."
 		die "Missing howl-compat support in avahi."
 	fi
-
-	# Does not play fine with this
-	filter-ldflags --as-needed -Wl,--as-needed
 }
 
 src_unpack() {
@@ -42,6 +39,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-pidfile.patch"
 	epatch "${FILESDIR}/${P}-persist-fix.patch"
 	epatch "${FILESDIR}/${P}-sparc.patch"
+	epatch "${FILESDIR}/${P}-libsorder.patch"
+
+	eautoreconf
 }
 
 src_compile() {