Added an updated linking patch as kindly provided by corsair on bug 209138. xmlrpc-c now respects the user's LDFLAGS. Fixes bug 209693.

(Portage version: 2.1.4.4)

4 files changed, 74 insertions, 3 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index 14bc73c506a4..876d4b917001 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,12 @@
 # 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.43 2008/02/22 23:24:14 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.44 2008/03/02 00:44:21 philantrop Exp $
+
+  02 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  files/xmlrpc-c-1.06.09-asneeded.patch,
+  +files/xmlrpc-c-1.06.09-strsol.patch, xmlrpc-c-1.06.09-r1.ebuild:
+  Added an updated linking patch as kindly provided by corsair on bug 209138.
+  xmlrpc-c now respects the user's LDFLAGS. Fixes bug 209693.
 
 *xmlrpc-c-1.06.09-r1 (22 Feb 2008)
 
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
index 2f3bc5437b7f..f9611f1faabc 100644
--- 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
@@ -19,3 +19,47 @@ Index: xmlrpc-c-1.06.09/src/Makefile
  
  LIB_OBJS = $(LIBXMLRPC_CLIENT_OBJS) $(LIBXMLRPC_SERVER_OBJS)
  
+diff -Naur xmlrpc-c-1.06.09.orig/examples/cpp/Makefile xmlrpc-c-1.06.09/examples/cpp/Makefile
+--- xmlrpc-c-1.06.09.orig/examples/cpp/Makefile	2006-01-09 00:36:06.000000000 +0100
++++ xmlrpc-c-1.06.09/examples/cpp/Makefile	2008-03-02 00:15:42.000000000 +0100
+@@ -63,13 +63,13 @@
+ all: $(PROGS)
+ 
+ $(SERVERPROGS_ABYSS):%:%.o
+-	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS)
++	$(CXXLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS)
+ 
+ $(LEGACY_CLIENTPROGS):%:%.o
+-	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_LEGACY_CLIENT)
++	$(CXXLD) -o $@ $^ $(LDADD_LEGACY_CLIENT) $(LDFLAGS)
+ 
+ $(CLIENTPROGS):%:%.o
+-	$(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
++	$(CXXLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS)
+ 
+ %.o:%.cpp
+ 	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $<
+diff -Naur xmlrpc-c-1.06.09.orig/examples/Makefile xmlrpc-c-1.06.09/examples/Makefile
+--- xmlrpc-c-1.06.09.orig/examples/Makefile	2005-11-20 22:39:57.000000000 +0100
++++ xmlrpc-c-1.06.09/examples/Makefile	2008-03-02 00:15:04.000000000 +0100
+@@ -81,16 +81,16 @@
+ 	$(MAKE) -C $(dir $@) $(notdir $@)
+ 
+ $(CLIENTPROGS):%:%.o
+-	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT)
++	$(CCLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS)
+ 
+ $(SERVERPROGS_CGI):%.cgi:%_cgi.o
+-	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_CGI)
++	$(CCLD) -o $@ $^ $(LDADD_SERVER_CGI) $(LDFLAGS)
+ 
+ $(SERVERPROGS_ABYSS):%:%.o
+-	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS)
++	$(CCLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS)
+ 
+ gen_sample_add_xml:%:%.o
+-	$(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_BASE)
++	$(CCLD) -o $@ $^ $(LDADD_BASE) $(LDFLAGS)
+ 
+ %.o:%.c
+ 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch
new file mode 100644
index 000000000000..094e1c510aaf
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch
@@ -0,0 +1,19 @@
+--- xmlrpc-c-1.06.09/tools/Makefile.common.orig	2006-07-30 05:07:28.000000000 +0200
++++ xmlrpc-c-1.06.09/tools/Makefile.common	2008-02-29 11:57:06.000000000 +0100
+@@ -1,6 +1,7 @@
+ # -*-makefile-*-    <-- an Emacs control
+ 
+ CLIENT_LDLIBS = -L$(BUILDDIR)/src/.libs -lxmlrpc_client -lxmlrpc
++CLIENT_LDLIBS += -L$(BUILDDIR)/lib/libutil/.libs -lxmlrpc_util
+ 
+ ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
+   CLIENT_LDLIBS += $(shell libwww-config --libs)
+@@ -14,8 +15,6 @@
+ 
+ CLIENT_LDLIBS += $(LDLIBS_XML)
+ 
+-CLIENT_LDLIBS += -L$(BUILDDIR)/lib/libutil/.libs -lxmlrpc_util
+-
+ 
+ UTIL_DIR = $(BUILDDIR)/lib/util
+ 
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild
index 060c05f8cfb4..e0935555dfc3 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-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-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild,v 1.1 2008/02/22 23:24:14 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.06.09-r1.ebuild,v 1.2 2008/03/02 00:44:21 philantrop Exp $
 
 inherit eutils
 
@@ -31,7 +31,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-1.05-pic.patch
 	epatch "${FILESDIR}"/${PN}-1.06.02-threadupdatestatus.patch
-	epatch "${FILESDIR}"/${PN}-1.06.02-strsol.patch
+	epatch "${FILESDIR}"/${P}-strsol.patch
 	epatch "${FILESDIR}"/${PN}-gcc43.patch
 	epatch "${FILESDIR}"/${P}-asneeded.patch
 
@@ -41,6 +41,8 @@ src_unpack() {
 }
 
 src_compile() {
+	# Respect the user's LDFLAGS.
+	export LADD=${LDFLAGS}
 	econf --disable-wininet-client --enable-libxml2-backend \
 		$(use_enable threads abyss-threads) \
 		$(use_enable curl curl-client) \