diff options
author | 2008-02-11 19:38:47 +0000 | |
---|---|---|
committer | 2008-02-11 19:38:47 +0000 | |
commit | 962250cf5c45dd13fe2bd5160c8926ffc1bb5b10 (patch) | |
tree | 56f86aba08296622609795bfa403279ac74d9101 /dev-libs/xmlrpc-c | |
parent | amd64 stable wrt #208039 (diff) | |
download | gentoo-2-962250cf5c45dd13fe2bd5160c8926ffc1bb5b10.tar.gz gentoo-2-962250cf5c45dd13fe2bd5160c8926ffc1bb5b10.tar.bz2 gentoo-2-962250cf5c45dd13fe2bd5160c8926ffc1bb5b10.zip |
Fix linking with --as-needed by properly link to libxml2 when using it. Fixes cmake build with --as-needed.
(Portage version: 2.1.4.3)
Diffstat (limited to 'dev-libs/xmlrpc-c')
-rw-r--r-- | dev-libs/xmlrpc-c/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch | 21 | ||||
-rw-r--r-- | dev-libs/xmlrpc-c/xmlrpc-c-1.06.09.ebuild | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog index 397c0571202b..e6ffd3f733c3 100644 --- a/dev-libs/xmlrpc-c/ChangeLog +++ b/dev-libs/xmlrpc-c/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/xmlrpc-c # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.40 2008/02/06 13:53:47 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.41 2008/02/11 19:38:46 flameeyes Exp $ + + 11 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> + +files/xmlrpc-c-1.06.09-asneeded.patch, xmlrpc-c-1.06.09.ebuild: + Fix linking with --as-needed by properly link to libxml2 when using it. + Fixes cmake build with --as-needed. 06 Feb 2008; Markus Rothe <corsair@gentoo.org> xmlrpc-c-1.06.09.ebuild: Back to ~ppc64. It fails on another machine diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch new file mode 100644 index 000000000000..2f3bc5437b7f --- /dev/null +++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch @@ -0,0 +1,21 @@ +Index: xmlrpc-c-1.06.09/src/Makefile +=================================================================== +--- xmlrpc-c-1.06.09.orig/src/Makefile ++++ xmlrpc-c-1.06.09/src/Makefile +@@ -48,6 +48,7 @@ endif + + ifeq ($(ENABLE_LIBXML2_BACKEND),yes) + LIBXML_INCLUDES = $(shell xml2-config --cflags) ++ LIBXML_LIBS = $(shell xml2-config --libs) + else + LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse + endif +@@ -95,7 +96,7 @@ LIBXMLRPC_OBJS = \ + xmlrpc_utf8.lo \ + xmlrpc_authcookie.lo \ + +-LIBXMLRPC_LIBDEP = -lxmlrpc_util ++LIBXMLRPC_LIBDEP = -lxmlrpc_util $(LIBXML_LIBS) + + LIB_OBJS = $(LIBXMLRPC_CLIENT_OBJS) $(LIBXMLRPC_SERVER_OBJS) + diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09.ebuild index a382cbfb905a..e4f31f2f8b62 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09.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-libs/xmlrpc-c/xmlrpc-c-1.06.09.ebuild,v 1.14 2008/02/06 13:53:47 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09.ebuild,v 1.15 2008/02/11 19:38:46 flameeyes Exp $ inherit eutils @@ -33,6 +33,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-1.06.02-threadupdatestatus.patch epatch "${FILESDIR}"/${PN}-1.06.02-strsol.patch epatch "${FILESDIR}"/${PN}-gcc43.patch + epatch "${FILESDIR}"/${P}-asneeded.patch # Respect the user's CFLAGS/CXXFLAGS. sed -i -e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" Makefile.common |