diff options
author | Wulf Krueger <philantrop@gentoo.org> | 2008-03-02 00:44:22 +0000 |
---|---|---|
committer | Wulf Krueger <philantrop@gentoo.org> | 2008-03-02 00:44:22 +0000 |
commit | fd7eb6487946339c900ac66690be8cdedf2f70fb (patch) | |
tree | 2581031f36bcde2805662f386bb86183b927ddb7 /dev-libs/xmlrpc-c/files | |
parent | fixed soname patch to address missing lib file (see bug #211443) (diff) | |
download | historical-fd7eb6487946339c900ac66690be8cdedf2f70fb.tar.gz historical-fd7eb6487946339c900ac66690be8cdedf2f70fb.tar.bz2 historical-fd7eb6487946339c900ac66690be8cdedf2f70fb.zip |
Added an updated linking patch as kindly provided by corsair on bug 209138. xmlrpc-c now respects the user's LDFLAGS. Fixes bug 209693.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-libs/xmlrpc-c/files')
-rw-r--r-- | dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch | 44 | ||||
-rw-r--r-- | dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch | 19 |
2 files changed, 63 insertions, 0 deletions
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 + |