SOURCES: xmlrpc-c-soname.patch - updated for 1.14.2 - change just libxmlrpc...
qboosh
qboosh at pld-linux.org
Wed May 14 18:50:30 CEST 2008
Author: qboosh Date: Wed May 14 16:50:30 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.14.2
- change just libxmlrpc name, leave the others unchanged
---- Files affected:
SOURCES:
xmlrpc-c-soname.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/xmlrpc-c-soname.patch
diff -u SOURCES/xmlrpc-c-soname.patch:1.6 SOURCES/xmlrpc-c-soname.patch:1.7
--- SOURCES/xmlrpc-c-soname.patch:1.6 Wed Apr 11 09:10:17 2007
+++ SOURCES/xmlrpc-c-soname.patch Wed May 14 18:50:24 2008
@@ -1,731 +1,138 @@
-diff -urN xmlrpc-c-1.10.00.org/configure.in xmlrpc-c-1.10.00/configure.in
---- xmlrpc-c-1.10.00.org/configure.in 2007-03-08 04:05:29.000000000 +0100
-+++ xmlrpc-c-1.10.00/configure.in 2007-04-11 09:07:07.778242073 +0200
-@@ -94,7 +94,7 @@
-
- dnl Set up the appropriate Makefile substitutions.
-
--LIBXMLRPC_CLIENT_LA=libxmlrpc_client.la
-+LIBXMLRPC_CLIENT_LA=libxmlrpc-c_client.la
- AC_SUBST(LIBXMLRPC_CLIENT_LA)
- CLIENTTEST=clienttest
- AC_SUBST(CLIENTTEST)
-@@ -140,7 +140,7 @@
- if test x"$enable_abyss_server" != xno; then
- FEATURE_LIST="abyss-server $FEATURE_LIST"
- ABYSS_SUBDIR=abyss
-- LIBXMLRPC_ABYSS_SERVER_LA=libxmlrpc_abyss_server.la
-+ LIBXMLRPC_ABYSS_SERVER_LA=libxmlrpc-c_abyss_server.la
- SERVERTEST=servertest
- VALIDATEE=validatee
- XMLRPC_ABYSS_H=xmlrpc_abyss.h
-@@ -180,7 +180,7 @@
- INTEROP_CLIENT_SUBDIR=
- if test x"$enable_cplusplus" != xno; then
- FEATURE_LIST="c++ $FEATURE_LIST"
-- LIBXMLRPC_CPP_A=libxmlrpc_cpp.a
-+ LIBXMLRPC_CPP_A=libxmlrpc-c_cpp.a
- CPPTEST=cpptest
- XMLRPCCPP_H=XmlRpcCpp.h
-
-diff -urN xmlrpc-c-1.10.00.org/lib/abyss/src/Makefile xmlrpc-c-1.10.00/lib/abyss/src/Makefile
---- xmlrpc-c-1.10.00.org/lib/abyss/src/Makefile 2007-03-01 02:05:55.000000000 +0100
-+++ xmlrpc-c-1.10.00/lib/abyss/src/Makefile 2007-04-11 09:07:51.635931285 +0200
-@@ -11,12 +11,12 @@
-
- default: all
-
--TARGET_LIBRARY_NAMES := libxmlrpc_abyss
-+TARGET_LIBRARY_NAMES := libxmlrpc-c_abyss
-
--STATIC_LIBRARIES_TO_INSTALL = libxmlrpc_abyss.a
-+STATIC_LIBRARIES_TO_INSTALL = libxmlrpc-c_abyss.a
-
--SHARED_LIBS_TO_BUILD := libxmlrpc_abyss
--SHARED_LIBS_TO_INSTALL := libxmlrpc_abyss
-+SHARED_LIBS_TO_BUILD := libxmlrpc-c_abyss
-+SHARED_LIBS_TO_INSTALL := libxmlrpc-c_abyss
-
- ifeq ($(ENABLE_ABYSS_THREADS),yes)
- THREAD_MODULE = thread_pthread
-@@ -52,13 +52,13 @@
-
- INCLUDES = -Iblddir -Isrcdir -Isrcdir/include -Isrcdir/lib/util/include
-
--ABYSS_SHLIB = $(call shlibfn,libxmlrpc_abyss)
--#ABYSS_SHLIB is e.g. libxmlrpc_abyss.so.3.1
--ABYSS_SHLIBLE = $(call shliblefn,libxmlrpc_abyss)
--#ABYSS_SHLIBLE is e.g. libxmlrpc_abyss.so
-+ABYSS_SHLIB = $(call shlibfn,libxmlrpc-c_abyss)
-+#ABYSS_SHLIB is e.g. libxmlrpc-c_abyss.so.3.1
-+ABYSS_SHLIBLE = $(call shliblefn,libxmlrpc-c_abyss)
-+#ABYSS_SHLIBLE is e.g. libxmlrpc-c_abyss.so
-
--# LIBDEP is the shared libraries on which libxmlrpc_abyss depends.
--# The runtime loader should load these libraries when it loads libxmlrpc_abyss.
-+# LIBDEP is the shared libraries on which libxmlrpc-c_abyss depends.
-+# The runtime loader should load these libraries when it loads libxmlrpc-c_abyss.
-
- LIBDEP = $(LIBXMLRPC_UTIL)
-
-@@ -72,7 +72,7 @@
- $(SRCDIR)/Makefile.common: srcdir blddir
-
- .PHONY: all
--all: libxmlrpc_abyss.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
-+all: libxmlrpc-c_abyss.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
-
-
- # Rule for this is in Makefile.common, courtesy of TARGET_SHARED_LIBRARIES:
-@@ -81,8 +81,8 @@
-
- # Rule for this is in Makefile.common, courtesy of TARGET_STATIC_LIBRARIES:
-
--libxmlrpc_abyss.a: $(TARGET_MODS:%=%.o)
--libxmlrpc_abyss.a: LIBOBJECTS = $(TARGET_MODS:%=%.o)
-+libxmlrpc-c_abyss.a: $(TARGET_MODS:%=%.o)
-+libxmlrpc-c_abyss.a: LIBOBJECTS = $(TARGET_MODS:%=%.o)
-
- #-----------------------------------------------------------------------------
- # RULES TO COMPILE OBJECT MODULES FOR LIBRARIES
-diff -urN xmlrpc-c-1.10.00.org/lib/expat/xmlparse/Makefile xmlrpc-c-1.10.00/lib/expat/xmlparse/Makefile
---- xmlrpc-c-1.10.00.org/lib/expat/xmlparse/Makefile 2007-03-22 21:59:48.000000000 +0100
-+++ xmlrpc-c-1.10.00/lib/expat/xmlparse/Makefile 2007-04-11 09:07:51.639264696 +0200
-@@ -18,7 +18,7 @@
-
- include $(SRCDIR)/Makefile.common
-
--all: libxmlrpc_xmlparse.la
-+all: libxmlrpc-c_xmlparse.la
-
- LIBXMLRPC_XMLPARSE_OBJS = xmlparse.lo
-
-@@ -26,16 +26,16 @@
-
- LIBLDFLAGS = $(LDFLAGS_VERSINFO) -L../xmltok/.libs $(RPATH) $(LADD)
-
--libxmlrpc_xmlparse.la: $(LIBXMLRPC_XMLPARSE_OBJS) $(LIBXMLRPC_XMLTOK)
-+libxmlrpc-c_xmlparse.la: $(LIBXMLRPC_XMLPARSE_OBJS) $(LIBXMLRPC_XMLTOK)
- $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \
-- $(LIBXMLRPC_XMLPARSE_OBJS) -lxmlrpc_xmltok
-+ $(LIBXMLRPC_XMLPARSE_OBJS) -lxmlrpc-c_xmltok
-
- CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
-
- $(LIBXMLRPC_XMLPARSE_OBJS):%.lo:%.c
- $(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $<
-
--LTLIBRARIES_TO_INSTALL = libxmlrpc_xmlparse.la
-+LTLIBRARIES_TO_INSTALL = libxmlrpc-c_xmlparse.la
-
- .PHONY: install
- install: install-common
-diff -urN xmlrpc-c-1.10.00.org/lib/expat/xmltok/Makefile xmlrpc-c-1.10.00/lib/expat/xmltok/Makefile
---- xmlrpc-c-1.10.00.org/lib/expat/xmltok/Makefile 2006-11-02 02:49:58.000000000 +0100
-+++ xmlrpc-c-1.10.00/lib/expat/xmltok/Makefile 2007-04-11 09:07:51.639264696 +0200
-@@ -29,7 +29,7 @@
- include $(SRCDIR)/Makefile.common
-
- .PHONY: all
--all: libxmlrpc_xmltok.la
-+all: libxmlrpc-c_xmltok.la
-
- .PHONY: clean
- clean: clean-common
-@@ -50,11 +50,11 @@
- .PHONY: dep
- dep: dep-common
-
--LTLIBRARIES_TO_INSTALL = libxmlrpc_xmltok.la
-+LTLIBRARIES_TO_INSTALL = libxmlrpc-c_xmltok.la
-
- LIBXMLRPC_XMLTOK_OBJS = xmltok.lo xmlrole.lo
-
--libxmlrpc_xmltok.la: $(LIBXMLRPC_XMLTOK_OBJS)
-+libxmlrpc-c_xmltok.la: $(LIBXMLRPC_XMLTOK_OBJS)
- $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
-
- $(LIBXMLRPC_XMLTOK_OBJS):%.lo:%.c
-diff -urN xmlrpc-c-1.10.00.org/lib/libutil/Makefile xmlrpc-c-1.10.00/lib/libutil/Makefile
---- xmlrpc-c-1.10.00.org/lib/libutil/Makefile 2007-03-05 03:01:54.000000000 +0100
-+++ xmlrpc-c-1.10.00/lib/libutil/Makefile 2007-04-11 09:07:51.629264463 +0200
-@@ -1,5 +1,5 @@
- ###############################################################################
--# This directory builds libxmlrpc_util, which contains utility
-+# This directory builds libxmlrpc-c_util, which contains utility
- # functions that are used by the Xmlprc-c # libraries, and also
- # directly by Xmlrpc-c programs.
- #
-@@ -20,12 +20,12 @@
-
- default: all
-
--TARGET_LIBRARY_NAMES := libxmlrpc_util
-+TARGET_LIBRARY_NAMES := libxmlrpc-c_util
-
--STATIC_LIBRARIES_TO_INSTALL = libxmlrpc_util.a
-+STATIC_LIBRARIES_TO_INSTALL = libxmlrpc-c_util.a
-
--SHARED_LIBS_TO_BUILD := libxmlrpc_util
--SHARED_LIBS_TO_INSTALL := libxmlrpc_util
-+SHARED_LIBS_TO_BUILD := libxmlrpc-c_util
-+SHARED_LIBS_TO_INSTALL := libxmlrpc-c_util
-
- TARGET_MODS = \
- casprintf \
-@@ -45,10 +45,10 @@
- INCLUDES = -I$(BLDDIR) -Isrcdir \
- -I$(BLDDIR)/include -Isrcdir/include -Isrcdir/lib/util/include
-
--UTIL_SHLIB = $(call shlibfn,libxmlrpc_util)
--#UTIL_SHLIB is e.g. libxmlrpc_util.so.3.1
--UTIL_SHLIBLE = $(call shliblefn,libxmlrpc_util)
--#UTIL_SHLIBLE is e.g. libxmlrpc_util.so
-+UTIL_SHLIB = $(call shlibfn,libxmlrpc-c_util)
-+#UTIL_SHLIB is e.g. libxmlrpc-c_util.so.3.1
-+UTIL_SHLIBLE = $(call shliblefn,libxmlrpc-c_util)
-+#UTIL_SHLIBLE is e.g. libxmlrpc-c_util.so
-
- ifneq ($(SHARED_LIB_TYPE),NONE)
- TARGET_SHARED_LIBS := $(UTIL_SHLIB) $(UTIL_SHLIBLE)
-@@ -60,7 +60,7 @@
- $(SRCDIR)/Makefile.common: srcdir blddir
-
- .PHONY: all
--all: libxmlrpc_util.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
-+all: libxmlrpc-c_util.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
-
- # Rule for this is in Makefile.common, courtesy of TARGET_SHARED_LIBRARIES:
- $(UTIL_SHLIB): $(TARGET_MODS:%=%.osh)
-@@ -68,8 +68,8 @@
-
- # Rule for this is in Makefile.common, courtesy of TARGET_STATIC_LIBRARIES:
-
--libxmlrpc_util.a: $(TARGET_MODS:%=%.o)
--libxmlrpc_util.a: LIBOBJECTS = $(TARGET_MODS:%=%.o)
-+libxmlrpc-c_util.a: $(TARGET_MODS:%=%.o)
-+libxmlrpc-c_util.a: LIBOBJECTS = $(TARGET_MODS:%=%.o)
-
- #-----------------------------------------------------------------------------
- # RULES TO COMPILE OBJECT MODULES FOR LIBRARIES
-diff -urN xmlrpc-c-1.10.00.org/lib/util/Makefile xmlrpc-c-1.10.00/lib/util/Makefile
---- xmlrpc-c-1.10.00.org/lib/util/Makefile 2007-02-26 04:46:23.000000000 +0100
-+++ xmlrpc-c-1.10.00/lib/util/Makefile 2007-04-11 09:07:51.629264463 +0200
-@@ -7,7 +7,7 @@
- # modules, the libraries will conflict with each other.
- #
- # So a utility function that is to be used by libraries (and, optionally,
--# programs) should go in libxmlrpc_util. libxmlrpc_util is a prerequisite
-+# programs) should go in libxmlrpc-c_util. libxmlrpc-c_util is a prerequisite
- # for many Xmlrpc-c libraries, gets included in a program link only once,
- # and uses external symbol names that have the "xmlrpc_" prefix to avoid
- # collision with users' code.
-diff -urN xmlrpc-c-1.10.00.org/Makefile.common xmlrpc-c-1.10.00/Makefile.common
---- xmlrpc-c-1.10.00.org/Makefile.common 2007-03-23 03:02:14.000000000 +0100
-+++ xmlrpc-c-1.10.00/Makefile.common 2007-04-11 09:07:51.619264230 +0200
-@@ -72,12 +72,12 @@
- # B is the revision number
- # A minus C is the major number.
- #
--# So you would get libxmlrpc.so.A-C.C.B .
-+# So you would get libxmlrpc-c.so.A-C.C.B .
- #
- # Our strategy is to make the library version numbers the same as the
- # Xmlrpc-c version numbers except that we update the major number when and
- # only when we make a non-backward-compatible change to the library. So
--# e.g. libxmlrpc for Xmlrpc-c 1.06.01 is named libxmlrpc.so.3.6.1.
-+# e.g. libxmlrpc-c for Xmlrpc-c 1.06.01 is named libxmlrpc-c.so.3.6.1.
-
- LDFLAGS_VERSINFO = -version-info 13:0:10 # 3.9.0
-
-@@ -157,60 +157,60 @@
-
- ifneq ($(OMIT_LIBXMLRPC_UTIL_RULE),Y)
- LIBXMLRPC_UTIL = \
-- $(call shliblefn, $(LIBXMLRPC_UTIL_DIR)/libxmlrpc_util)
--LIBXMLRPC_UTIL_A = $(LIBXMLRPC_UTIL_DIR)/libxmlrpc_util.a
-+ $(call shliblefn, $(LIBXMLRPC_UTIL_DIR)/libxmlrpc-c_util)
-+LIBXMLRPC_UTIL_A = $(LIBXMLRPC_UTIL_DIR)/libxmlrpc-c_util.a
- endif
-
- ifneq ($(OMIT_XMLRPC_LIB_RULE),Y)
-
--LIBXMLRPC = $(BLDDIR)/src/libxmlrpc.la
--LIBXMLRPC_CLIENT = $(BLDDIR)/src/libxmlrpc_client.la
--LIBXMLRPC_SERVER = $(BLDDIR)/src/libxmlrpc_server.la
--LIBXMLRPC_SERVER_ABYSS = $(BLDDIR)/src/libxmlrpc_server_abyss.la
--LIBXMLRPC_SERVER_CGI = $(BLDDIR)/src/libxmlrpc_server_cgi.la
--
--LIBXMLRPC_A = $(BLDDIR)/src/.libs/libxmlrpc.a
--LIBXMLRPC_CLIENT_A = $(BLDDIR)/src/.libs/libxmlrpc_client.a
--LIBXMLRPC_SERVER_A = $(BLDDIR)/src/.libs/libxmlrpc_server.a
--LIBXMLRPC_SERVER_ABYSS_A = $(BLDDIR)/src/.libs/libxmlrpc_server_abyss.a
--LIBXMLRPC_SERVER_CGI_A = $(BLDDIR)/src/.libs/libxmlrpc_server_cgi.a
-+LIBXMLRPC = $(BLDDIR)/src/libxmlrpc-c.la
-+LIBXMLRPC_CLIENT = $(BLDDIR)/src/libxmlrpc-c_client.la
-+LIBXMLRPC_SERVER = $(BLDDIR)/src/libxmlrpc-c_server.la
-+LIBXMLRPC_SERVER_ABYSS = $(BLDDIR)/src/libxmlrpc-c_server_abyss.la
-+LIBXMLRPC_SERVER_CGI = $(BLDDIR)/src/libxmlrpc-c_server_cgi.la
-+
-+LIBXMLRPC_A = $(BLDDIR)/src/.libs/libxmlrpc-c.a
-+LIBXMLRPC_CLIENT_A = $(BLDDIR)/src/.libs/libxmlrpc-c_client.a
-+LIBXMLRPC_SERVER_A = $(BLDDIR)/src/.libs/libxmlrpc-c_server.a
-+LIBXMLRPC_SERVER_ABYSS_A = $(BLDDIR)/src/.libs/libxmlrpc-c_server_abyss.a
-+LIBXMLRPC_SERVER_CGI_A = $(BLDDIR)/src/.libs/libxmlrpc-c_server_cgi.a
-
- endif
-
- ifneq ($(OMIT_XMLTOK_LIB_RULE),Y)
--LIBXMLRPC_XMLTOK = $(BLDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
--LIBXMLRPC_XMLTOK_A = $(BLDDIR)/lib/expat/xmltok/.libs/libxmlrpc_xmltok.a
-+LIBXMLRPC_XMLTOK = $(BLDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la
-+LIBXMLRPC_XMLTOK_A = $(BLDDIR)/lib/expat/xmltok/.libs/libxmlrpc-c_xmltok.a
- endif
-
- ifneq ($(OMIT_XMLPARSE_LIB_RULE),Y)
--LIBXMLRPC_XMLPARSE = $(BLDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la
--LIBXMLRPC_XMLPARSE_A = $(BLDDIR)/lib/expat/xmlparse/.libs/libxmlrpc_xmlparse.a
-+LIBXMLRPC_XMLPARSE = $(BLDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la
-+LIBXMLRPC_XMLPARSE_A = $(BLDDIR)/lib/expat/xmlparse/.libs/libxmlrpc-c_xmlparse.a
- endif
+--- xmlrpc-c-1.14.2/src/Makefile.orig 2008-04-18 18:22:02.000000000 +0200
++++ xmlrpc-c-1.14.2/src/Makefile 2008-05-14 18:00:46.261646516 +0200
+@@ -15,7 +15,7 @@
+ SUBDIRS += cpp
+ endif
+
+-TARGET_LIBRARY_NAMES := libxmlrpc libxmlrpc_server
++TARGET_LIBRARY_NAMES := libxmlrpc-c libxmlrpc_server
+
+ # We cannot build libxmlrpc_server_abyss if we can't also build Abyss,
+ # because we need libxmlrpc_abyss in order to build the proper runtime
+@@ -141,7 +141,7 @@
+ # shlibfn generates e.g. libxmlrpc.so.3.1
+ # shliblefn generates e.g. libxmlrpc.so
+
+-LIBXMLRPC = $(call shlibfn, libxmlrpc)
++LIBXMLRPC = $(call shlibfn, libxmlrpc-c)
+
+ $(LIBXMLRPC): $(LIBXMLRPC_MODS:%=%.osh) \
+ $(LIBXMLRPC_UTIL) \
+@@ -156,7 +156,7 @@
+ $(LIBXMLRPC_SERVER): \
+ $(LIBXMLRPC_SERVER_MODS:%=%.osh) \
+ $(LIBXMLRPC_UTIL) \
+- $(call shliblefn, libxmlrpc)
++ $(call shliblefn, libxmlrpc-c)
+ $(LIBXMLRPC_SERVER): LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.osh)
+ $(LIBXMLRPC_SERVER): LIBDEP = \
+ -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc
+@@ -168,7 +168,7 @@
+ $(LIBXMLRPC_UTIL) \
+ $(LIBXMLRPC_ABYSS) \
+ $(call shliblefn, libxmlrpc_server) \
+- $(call shliblefn, libxmlrpc)
++ $(call shliblefn, libxmlrpc-c)
+ $(LIBXMLRPC_SERVER_ABYSS): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSS_MODS:%=%.osh)
+ $(LIBXMLRPC_SERVER_ABYSS): LIBDEP = \
+ -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
+@@ -182,7 +182,7 @@
+ $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh) \
+ $(LIBXMRPC_UTIL) \
+ $(call shliblefn, libxmlrpc_server) \
+- $(call shliblefn, libxmlrpc)
++ $(call shliblefn, libxmlrpc-c)
+ $(LIBXMLRPC_SERVER_CGI): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh)
+ $(LIBXMLRPC_SERVER_CGI): LIBDEP = \
+ -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc_server -lxmlrpc
+@@ -193,7 +193,7 @@
+ $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \
+ $(TRANSPORT_MODS:%=%.osh) \
+ $(LIBXMLRPC_UTIL) \
+- $(call shliblefn, libxmlrpc)
++ $(call shliblefn, libxmlrpc-c)
+ $(LIBXMLRPC_CLIENT): LIBOBJECTS = \
+ $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \
+ $(TRANSPORT_MODS:%=%.osh)
+@@ -203,8 +203,8 @@
+ $(TRANSPORT_LIBDEP)
+
+
+-libxmlrpc.a: $(LIBXMLRPC_MODS:%=%.o)
+-libxmlrpc.a: LIBOBJECTS = $(LIBXMLRPC_MODS:%=%.o)
++libxmlrpc-c.a: $(LIBXMLRPC_MODS:%=%.o)
++libxmlrpc-c.a: LIBOBJECTS = $(LIBXMLRPC_MODS:%=%.o)
+
+ libxmlrpc_server.a: $(LIBXMLRPC_SERVER_MODS:%=%.o)
+ libxmlrpc_server.a: LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.o)
+--- xmlrpc-c-1.14.2/tools/Makefile.common.orig 2008-03-27 19:17:42.000000000 +0100
++++ xmlrpc-c-1.14.2/tools/Makefile.common 2008-05-14 18:01:21.855674904 +0200
+@@ -11,7 +11,7 @@
- LIBXMLRPC_ABYSS_DIR = $(BLDDIR)/lib/abyss/src
+ CLIENT_LDLIBS = -L$(BLDDIR)/src -L$(BLDDIR)/lib/libutil
- ifneq ($(OMIT_ABYSS_LIB_RULE),Y)
- LIBXMLRPC_ABYSS = \
-- $(call shliblefn, $(LIBXMLRPC_ABYSS_DIR)/libxmlrpc_abyss)
--LIBXMLRPC_ABYSS_A = $(LIBXMLRPC_ABYSS_DIR)/libxmlrpc_abyss.a
-+ $(call shliblefn, $(LIBXMLRPC_ABYSS_DIR)/libxmlrpc-c_abyss)
-+LIBXMLRPC_ABYSS_A = $(LIBXMLRPC_ABYSS_DIR)/libxmlrpc-c_abyss.a
- endif
-
- ifneq ($(OMIT_CPP_LIB_RULES),Y)
- LIBXMLRPC_CPP = \
-- $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc_cpp)
--LIBXMLRPC_CPP_A = $(BLDDIR)/src/cpp/libxmlrpc_cpp.a
-+ $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc-c_cpp)
-+LIBXMLRPC_CPP_A = $(BLDDIR)/src/cpp/libxmlrpc-c_cpp.a
- LIBXMLRPCPP = \
-- $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc++)
--LIBXMLRPCPP_A = $(BLDDIR)/src/cpp/libxmlrpc++.a
-+ $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc-c++)
-+LIBXMLRPCPP_A = $(BLDDIR)/src/cpp/libxmlrpc-c++.a
- LIBXMLRPC_CLIENTPP = \
-- $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc_client++)
--LIBXMLRPC_CLIENTPP_A = $(BLDDIR)/src/cpp/libxmlrpc_client++.a
-+ $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc-c_client++)
-+LIBXMLRPC_CLIENTPP_A = $(BLDDIR)/src/cpp/libxmlrpc-c_client++.a
- LIBXMLRPC_SERVERPP = \
-- $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc_server++)
--LIBXMLRPC_SERVERPP_A = $(BLDDIR)/src/cpp/libxmlrpc_server++.a
-+ $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc-c_server++)
-+LIBXMLRPC_SERVERPP_A = $(BLDDIR)/src/cpp/libxmlrpc-c_server++.a
- LIBXMLRPC_SERVER_ABYSSPP = \
-- $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc_server_abyss++)
--LIBXMLRPC_SERVER_ABYSSPP_A = $(BLDDIR)/src/cpp/libxmlrpc_server_abyss++.a
-+ $(call shliblefn, $(BLDDIR)/src/cpp/libxmlrpc-c_server_abyss++)
-+LIBXMLRPC_SERVER_ABYSSPP_A = $(BLDDIR)/src/cpp/libxmlrpc-c_server_abyss++.a
- endif
+-CLIENT_LDLIBS += -lxmlrpc_client -lxmlrpc -lxmlrpc_util
++CLIENT_LDLIBS += -lxmlrpc_client -lxmlrpc-c -lxmlrpc_util
- CASPRINTF = $(BLDDIR)/lib/util/casprintf.o
-@@ -228,9 +228,9 @@
- LIBXMLRPC_XML = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK)
- LDLIBS_XML = \
- -L$(BLDDIR)/lib/expat/xmlparse/.libs \
-- -lxmlrpc_xmlparse \
-+ -lxmlrpc-c-c_xmlparse \
- -L$(BLDDIR)/lib/expat/xmltok/.libs \
-- -lxmlrpc_xmltok
-+ -lxmlrpc-c-c_xmltok
- else
- LDLIBS_XML = $(shell xml2-config --libs)
- endif
-diff -urN xmlrpc-c-1.10.00.org/src/cpp/Makefile xmlrpc-c-1.10.00/src/cpp/Makefile
---- xmlrpc-c-1.10.00.org/src/cpp/Makefile 2007-02-23 23:01:07.000000000 +0100
-+++ xmlrpc-c-1.10.00/src/cpp/Makefile 2007-04-11 09:07:51.632597874 +0200
-@@ -10,17 +10,17 @@
-
- default: all
-
--# libxmlrpc_cpp is the legacy C++ wrapper library. The others are the
-+# libxmlrpc-c_cpp is the legacy C++ wrapper library. The others are the
- # more elaborate replacements.
-
- TARGET_LIB_NAMES_PP := \
-- libxmlrpc_cpp \
-- libxmlrpc++ \
-- libxmlrpc_server++ \
-- libxmlrpc_server_abyss++ \
-+ libxmlrpc-c_cpp \
-+ libxmlrpc-c++ \
-+ libxmlrpc-c_server++ \
-+ libxmlrpc-c_server_abyss++ \
-
- ifeq ($(MUST_BUILD_CLIENT),yes)
-- TARGET_LIB_NAMES_PP += libxmlrpc_client++
-+ TARGET_LIB_NAMES_PP += libxmlrpc-c_client++
- endif
+ ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
+ CLIENT_LDLIBS += $(shell libwww-config --libs)
+--- xmlrpc-c-1.14.2/Makefile.common.orig 2008-05-14 17:43:31.882708000 +0200
++++ xmlrpc-c-1.14.2/Makefile.common 2008-05-14 17:59:12.072278970 +0200
+@@ -142,7 +142,7 @@
+ ifneq ($(OMIT_XMLRPC_LIB_RULE),Y)
- STATIC_LIBRARIES_TO_INSTALL = $(TARGET_STATIC_LIBRARIES)
-@@ -78,13 +78,13 @@
- -Isrcdir/lib/util/include
-
-
--# LIBXMLRPC_CPP is e.g. "libxmlrpc_cpp.so.3.1"
-+# LIBXMLRPC_CPP is e.g. "libxmlrpc-c_cpp.so.3.1"
-
--LIBXMLRPC_CPP = $(call shlibfn, libxmlrpc_cpp)
--LIBXMLRPCPP = $(call shlibfn, libxmlrpc++)
--LIBXMLRPC_SERVERPP = $(call shlibfn, libxmlrpc_server++)
--LIBXMLRPC_SERVER_ABYSSPP = $(call shlibfn, libxmlrpc_server_abyss++)
--LIBXMLRPC_CLIENTPP = $(call shlibfn, libxmlrpc_client++)
-+LIBXMLRPC_CPP = $(call shlibfn, libxmlrpc-c_cpp)
-+LIBXMLRPCPP = $(call shlibfn, libxmlrpc-c++)
-+LIBXMLRPC_SERVERPP = $(call shlibfn, libxmlrpc-c_server++)
-+LIBXMLRPC_SERVER_ABYSSPP = $(call shlibfn, libxmlrpc-c_server_abyss++)
-+LIBXMLRPC_CLIENTPP = $(call shlibfn, libxmlrpc-c_client++)
-
-
- # TARGET_STATIC_LIBARIES, etc. are set by Makefile.common, based on
-@@ -119,20 +119,20 @@
-
- # Rules for these are in Makefile.common, courtesy of TARGET_LIB_NAMES_PP:
-
--libxmlrpc_cpp.a: XmlRpcCpp.o
--libxmlrpc_cpp.a: LIBOBJECTS = XmlRpcCpp.o
-+libxmlrpc-c_cpp.a: XmlRpcCpp.o
-+libxmlrpc-c_cpp.a: LIBOBJECTS = XmlRpcCpp.o
-
--libxmlrpc++.a: $(LIBXMLRPCPP_MODS:%=%.o)
--libxmlrpc++.a: LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.o)
-+libxmlrpc-c++.a: $(LIBXMLRPCPP_MODS:%=%.o)
-+libxmlrpc-c++.a: LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.o)
-
--libxmlrpc_server++.a: $(LIBXMLRPC_SERVERPP_MODS:%=%.o)
--libxmlrpc_server++.a: LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.o)
-+libxmlrpc-c_server++.a: $(LIBXMLRPC_SERVERPP_MODS:%=%.o)
-+libxmlrpc-c_server++.a: LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.o)
-
--libxmlrpc_server_abyss++.a: $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.o)
--libxmlrpc_server_abyss++.a: LIBOBJECTS=$(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.o)
-+libxmlrpc-c_server_abyss++.a: $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.o)
-+libxmlrpc-c_server_abyss++.a: LIBOBJECTS=$(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.o)
-
--libxmlrpc_client++.a: $(LIBXMLRPC_CLIENTPP_MODS:%=%.o)
--libxmlrpc_client++.a: LIBOBJECTS = $(LIBXMLRPC_CLIENTPP_MODS:%=%.o)
-+libxmlrpc-c_client++.a: $(LIBXMLRPC_CLIENTPP_MODS:%=%.o)
-+libxmlrpc-c_client++.a: LIBOBJECTS = $(LIBXMLRPC_CLIENTPP_MODS:%=%.o)
-
- #-----------------------------------------------------------------------------
- # RULES TO COMPILE OBJECT MODULES FOR LIBRARIES
-diff -urN xmlrpc-c-1.10.00.org/src/Makefile xmlrpc-c-1.10.00/src/Makefile
---- xmlrpc-c-1.10.00.org/src/Makefile 2007-02-26 05:25:51.000000000 +0100
-+++ xmlrpc-c-1.10.00/src/Makefile 2007-04-11 09:07:51.622597641 +0200
-@@ -57,7 +57,7 @@
- XML_PARSER_LIBDEP_DEP =
- else
- XMLRPC_XML_PARSER = xmlrpc_expat.lo
-- XML_PARSER_LIBDEP = -L$(BLDDIR)/lib/expat/xmlparse/.libs -lxmlrpc_xmlparse
-+ XML_PARSER_LIBDEP = -L$(BLDDIR)/lib/expat/xmlparse/.libs -lxmlrpc-c_xmlparse
- XML_PARSER_LIBDEP_DEP = $(LIBXMLRPC_XMLPARSE)
- endif
+ LIBXMLRPC = \
+- $(call shliblefn, $(BLDDIR)/src/libxmlrpc)
++ $(call shliblefn, $(BLDDIR)/src/libxmlrpc-c)
+ LIBXMLRPC_CLIENT = \
+ $(call shliblefn, $(BLDDIR)/src/libxmlrpc_client)
+ LIBXMLRPC_SERVER = \
+@@ -152,7 +152,7 @@
+ LIBXMLRPC_SERVER_CGI = \
+ $(call shliblefn, $(BLDDIR)/src/libxmlrpc_server_cgi)
+
+-LIBXMLRPC_A = $(BLDDIR)/src/libxmlrpc.a
++LIBXMLRPC_A = $(BLDDIR)/src/libxmlrpc-c.a
+ LIBXMLRPC_CLIENT_A = $(BLDDIR)/src/libxmlrpc_client.a
+ LIBXMLRPC_SERVER_A = $(BLDDIR)/src/libxmlrpc_server.a
+ LIBXMLRPC_SERVER_ABYSS_A = $(BLDDIR)/src/libxmlrpc_server_abyss.a
+--- xmlrpc-c-1.14.2/xmlrpc-c-config.main.orig 2008-04-18 18:22:02.000000000 +0200
++++ xmlrpc-c-1.14.2/xmlrpc-c-config.main 2008-05-14 18:02:04.022081182 +0200
+@@ -45,7 +45,7 @@
-@@ -76,23 +76,23 @@
- # ".../libfoo.so".
+ the_libdirs="-L$LIBINST_DIR $the_libdirs"
- LIBXMLRPC_CLIENT_OBJS = xmlrpc_client.lo xmlrpc_client_global.lo
--LIBXMLRPC_CLIENT_LIBDEP = -lxmlrpc_util -lxmlrpc
-+LIBXMLRPC_CLIENT_LIBDEP = -lxmlrpc-c_util -lxmlrpc-c
- LIBXMLRPC_CLIENT_LIBDEP_DEP = $(LIBXMLRPC_UTIL) $(LIBXMLRPC)
-
- LIBXMLRPC_SERVER_OBJS = registry.lo method.lo system_method.lo
--LIBXMLRPC_SERVER_LIBDEP = -lxmlrpc_util -lxmlrpc
-+LIBXMLRPC_SERVER_LIBDEP = -lxmlrpc-c_util -lxmlrpc-c
- LIBXMLRPC_SERVER_LIBDEP_DEP = $(LIBXMLRPC_UTIL) $(LIBXMLRPC)
-
- LIBXMLRPC_SERVER_ABYSS_OBJS = xmlrpc_server_abyss.lo
- LIBXMLRPC_SERVER_ABYSS_LIBDEP = \
-- -lxmlrpc_util -lxmlrpc_server -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
-- -lxmlrpc
-+ -lxmlrpc-c_util -lxmlrpc-c_server -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc-c_abyss \
-+ -lxmlrpc-c
- LIBXMLRPC_SERVER_ABYSS_LIBDEP_DEP = \
- $(LIBXMLRPC_UTIL) $(LIBXMLRPC_SERVER) $(LIBXMLRPC_ABYSS) \
+-the_libs="-lxmlrpc -lxmlrpc_util ${LIBXML}"
++the_libs="-lxmlrpc-c -lxmlrpc_util ${LIBXML}"
+ the_rpath="-R$LIBINST_DIR $the_rpath"
+ the_wl_rpath="-Wl,-rpath,$LIBINST_DIR $the_wl_rpath"
+
+--- xmlrpc-c-1.14.2/src/cpp/Makefile.orig 2008-03-27 19:17:42.000000000 +0100
++++ xmlrpc-c-1.14.2/src/cpp/Makefile 2008-05-14 18:23:45.688255558 +0200
+@@ -114,7 +114,7 @@
+ $(LIBXMLRPCPP): $(LIBXMLRPCPP_MODS:%=%.osh) \
$(LIBXMLRPC)
+ $(LIBXMLRPCPP): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh)
+-$(LIBXMLRPCPP): LIBDEP = -Lblddir/src -lxmlrpc
++$(LIBXMLRPCPP): LIBDEP = -Lblddir/src -lxmlrpc-c
- LIBXMLRPC_SERVER_CGI_OBJS = xmlrpc_server_cgi.lo
--LIBXMLRPC_SERVER_CGI_LIBDEP = -lxmlrpc_util -lxmlrpc_server -lxmlrpc
-+LIBXMLRPC_SERVER_CGI_LIBDEP = -lxmlrpc-c_util -lxmlrpc-c_server -lxmlrpc-c
- LIBXMLRPC_SERVER_CGI_LIBDEP_DEP = \
- $(LIBXMRPC_UTIL) $(LIBXMLRPC_SERVER) $(LIBXMLRPC)
-
-@@ -112,7 +112,7 @@
- xmlrpc_utf8.lo \
- xmlrpc_authcookie.lo \
-
--LIBXMLRPC_LIBDEP = -lxmlrpc_util $(XML_PARSER_LIBDEP)
-+LIBXMLRPC_LIBDEP = -lxmlrpc-c_util $(XML_PARSER_LIBDEP)
- LIBXMLRPC_LIBDEP_DEP = $(LIBXMLRPC_UTIL) $(XML_PARSER_LIBDEP_DEP)
-
- LIB_OBJS = $(LIBXMLRPC_CLIENT_OBJS) $(LIBXMLRPC_SERVER_OBJS)
-@@ -131,22 +131,22 @@
- $(TRANSPORT_INCLUDES) \
- $(LIBXML_INCLUDES) \
-
--TARGET_LTLIBRARIES = libxmlrpc.la libxmlrpc_server.la
-+TARGET_LTLIBRARIES = libxmlrpc-c.la libxmlrpc-c_server.la
-
--# We cannot build libxmlrpc_server_abyss if we can't also build Abyss,
--# because we need libxmlrpc_abyss in order to build the proper runtime
--# dependencies into libxmlrpc_server_abyss.
-+# We cannot build libxmlrpc-c_server_abyss if we can't also build Abyss,
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xmlrpc-c-soname.patch?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list