[gentoo-commits] gentoo-x86 commit in dev-libs/xmlrpc-c/files: xmlrpc-c-1.06.09-asneeded.patch xmlrpc-c-1.06.09-strsol.patch

[gentoo-commits] gentoo-x86 commit in dev-libs/xmlrpc-c/files: xmlrpc-c-1.06.09-asneeded.patch xmlrpc-c-1.06.09-strsol.patch

[Wulf Krueger (philantrop)]

philantrop    08/03/02 00:44:22

  Modified:             xmlrpc-c-1.06.09-asneeded.patch
  Added:                xmlrpc-c-1.06.09-strsol.patch
  Log:
  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)

Revision  Changes    Path
1.2                  dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch?r1=1.1&r2=1.2

Index: xmlrpc-c-1.06.09-asneeded.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlrpc-c-1.06.09-asneeded.patch	11 Feb 2008 19:38:47 -0000	1.1
+++ xmlrpc-c-1.06.09-asneeded.patch	2 Mar 2008 00:44:22 -0000	1.2
@@ -19,3 +19,47 @@
  
  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) $<



1.1                  dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch?rev=1.1&content-type=text/plain

Index: xmlrpc-c-1.06.09-strsol.patch
===================================================================
--- 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
 



-- 
gentoo-commits@lists.gentoo.org mailing list