1 --- xmlrpc-c/src/Makefile.orig 2013-03-03 16:31:13.000000000 +0100
2 +++ xmlrpc-c/src/Makefile 2013-03-03 17:08:21.062194251 +0100
7 -TARGET_LIBRARY_NAMES := libxmlrpc libxmlrpc_server
8 +TARGET_LIBRARY_NAMES := libxmlrpc-c libxmlrpc_server
10 # We cannot build libxmlrpc_server_abyss if we can't also build Abyss,
11 # because we need libxmlrpc_abyss in order to build the proper runtime
13 # shlibfn generates e.g. libxmlrpc.so.3.1
14 # shliblefn generates e.g. libxmlrpc.so
16 -LIBXMLRPC = $(call shlibfn, libxmlrpc)
17 +LIBXMLRPC = $(call shlibfn, libxmlrpc-c)
19 $(LIBXMLRPC): $(LIBXMLRPC_MODS:%=%.osh) \
22 $(LIBXMLRPC_SERVER): \
23 $(LIBXMLRPC_SERVER_MODS:%=%.osh) \
25 - $(call shliblefn, libxmlrpc)
26 + $(call shliblefn, libxmlrpc-c)
27 $(LIBXMLRPC_SERVER): LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.osh)
28 $(LIBXMLRPC_SERVER): LIBDEP = \
29 - -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
30 + -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
32 LIBXMLRPC_SERVER_ABYSS = $(call shlibfn, libxmlrpc_server_abyss)
37 $(call shliblefn, libxmlrpc_server) \
38 - $(call shliblefn, libxmlrpc)
39 + $(call shliblefn, libxmlrpc-c)
40 $(LIBXMLRPC_SERVER_ABYSS): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSS_MODS:%=%.osh)
41 $(LIBXMLRPC_SERVER_ABYSS): LIBDEP = \
43 -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
44 - -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
45 + -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
47 $(LIBXMLRPC_SERVER_ABYSS): LIBDEP += -lws2_32 -lwsock32
50 $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh) \
52 $(call shliblefn, libxmlrpc_server) \
53 - $(call shliblefn, libxmlrpc)
54 + $(call shliblefn, libxmlrpc-c)
55 $(LIBXMLRPC_SERVER_CGI): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh)
56 $(LIBXMLRPC_SERVER_CGI): LIBDEP = \
58 - -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
59 + -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
61 LIBXMLRPC_CLIENT = $(call shlibfn, libxmlrpc_client)
64 $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \
65 $(TRANSPORT_MODS:%=%.osh) \
67 - $(call shliblefn, libxmlrpc)
68 + $(call shliblefn, libxmlrpc-c)
69 $(LIBXMLRPC_CLIENT): LIBOBJECTS = \
70 $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \
71 $(TRANSPORT_MODS:%=%.osh)
74 LIBXMLRPC_CLIENT_LIBDEP = \
75 -Lblddir/src -Lblddir/lib/libutil \
76 - -lxmlrpc -lxmlrpc_util \
77 + -lxmlrpc-c -lxmlrpc_util \
78 $(XML_PARSER_LIBDEP) \
82 $(LIBXMLRPC_CLIENT): LIBDEP += -lws2_32 -lwsock32 -lpthread
85 -libxmlrpc.a: $(LIBXMLRPC_MODS:%=%.o)
86 -libxmlrpc.a: LIBOBJECTS = $(LIBXMLRPC_MODS:%=%.o)
87 +libxmlrpc-c.a: $(LIBXMLRPC_MODS:%=%.o)
88 +libxmlrpc-c.a: LIBOBJECTS = $(LIBXMLRPC_MODS:%=%.o)
90 libxmlrpc_server.a: $(LIBXMLRPC_SERVER_MODS:%=%.o)
91 libxmlrpc_server.a: LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.o)
92 --- xmlrpc-c-1.14.2/common.mk 2008-05-14 17:43:31.882708000 +0200
93 +++ xmlrpc-c-1.14.2/common.mk 2008-05-14 17:59:12.072278970 +0200
95 ifneq ($(OMIT_XMLRPC_LIB_RULE),Y)
98 - $(call shliblefn, $(BLDDIR)/src/libxmlrpc)
99 + $(call shliblefn, $(BLDDIR)/src/libxmlrpc-c)
101 $(call shliblefn, $(BLDDIR)/src/libxmlrpc_client)
104 LIBXMLRPC_SERVER_CGI = \
105 $(call shliblefn, $(BLDDIR)/src/libxmlrpc_server_cgi)
107 -LIBXMLRPC_A = $(BLDDIR)/src/libxmlrpc.a
108 +LIBXMLRPC_A = $(BLDDIR)/src/libxmlrpc-c.a
109 LIBXMLRPC_CLIENT_A = $(BLDDIR)/src/libxmlrpc_client.a
110 LIBXMLRPC_SERVER_A = $(BLDDIR)/src/libxmlrpc_server.a
111 LIBXMLRPC_SERVER_ABYSS_A = $(BLDDIR)/src/libxmlrpc_server_abyss.a
112 --- xmlrpc-c/xmlrpc-c-config.main.orig 2013-03-03 17:06:35.282198688 +0100
113 +++ xmlrpc-c/xmlrpc-c-config.main 2013-03-03 17:44:58.868768683 +0100
116 the_libdirs="-L$LIBINST_DIR $the_libdirs"
118 -the_libs="-lxmlrpc ${LIBXML} -lxmlrpc_util"
119 +the_libs="-lxmlrpc-c ${LIBXML} -lxmlrpc_util"
120 the_rpath="-R$LIBINST_DIR $the_rpath"
121 the_wl_rpath="-Wl,-rpath,$LIBINST_DIR $the_wl_rpath"
123 --- xmlrpc-c/src/cpp/Makefile.orig 2013-03-03 16:31:11.000000000 +0100
124 +++ xmlrpc-c/src/cpp/Makefile 2013-03-03 17:46:03.132099319 +0100
127 $(LIBXMLRPC_CPP_SH): LIBOBJECTS = XmlRpcCpp.osh
128 $(LIBXMLRPC_CPP_SH): LIBDEP = \
129 - -Lblddir/src -lxmlrpc_server -lxmlrpc \
130 + -Lblddir/src -lxmlrpc_server -lxmlrpc-c \
131 $(XML_PARSER_LIBDEP) \
132 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
136 $(LIBXMLRPCPP_SH): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh)
137 $(LIBXMLRPCPP_SH): LIBDEP = \
138 - -Lblddir/src -lxmlrpc \
139 + -Lblddir/src -lxmlrpc-c \
140 $(XML_PARSER_LIBDEP) \
141 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
144 $(LIBXMLRPC_SERVERPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.osh)
145 $(LIBXMLRPC_SERVERPP_SH): LIBDEP = \
146 -L. -l$(LIBXMLRPCPP_NAME) \
147 - -Lblddir/src -lxmlrpc_server -lxmlrpc \
148 + -Lblddir/src -lxmlrpc_server -lxmlrpc-c \
149 $(XML_PARSER_LIBDEP) \
150 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
153 $(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh)
154 $(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBDEP = \
155 -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) \
156 - -Lblddir/src -lxmlrpc_server_abyss -lxmlrpc_server -lxmlrpc \
157 + -Lblddir/src -lxmlrpc_server_abyss -lxmlrpc_server -lxmlrpc-c \
158 $(XML_PARSER_LIBDEP) \
159 -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
160 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
162 $(LIBXMLRPC_SERVER_CGIPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh)
163 $(LIBXMLRPC_SERVER_CGIPP_SH): LIBDEP = \
164 -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) \
165 - -Lblddir/src -lxmlrpc_server -lxmlrpc \
166 + -Lblddir/src -lxmlrpc_server -lxmlrpc-c \
167 $(XML_PARSER_LIBDEP) \
168 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
171 $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh)
172 $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBDEP = \
173 -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket \
174 - -Lblddir/src -lxmlrpc_server -lxmlrpc \
175 + -Lblddir/src -lxmlrpc_server -lxmlrpc-c \
176 $(XML_PARSER_LIBDEP) \
177 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
180 $(LIBXMLRPC_CLIENTPP_SH): LIBDEP = \
181 -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket \
182 $(shell cat blddir/src/libxmlrpc_client.ldflags) \
183 - -Lblddir/src -lxmlrpc_client -lxmlrpc \
184 + -Lblddir/src -lxmlrpc_client -lxmlrpc-c \
185 $(XML_PARSER_LIBDEP) \
186 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
189 $(LIBXMLRPC_PACKETSOCKET_SH): LIBOBJECTS = $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh)
190 $(LIBXMLRPC_PACKETSOCKET_SH): LIBDEP = \
191 -L. -l$(LIBXMLRPCPP_NAME) \
192 - -Lblddir/src -lxmlrpc \
193 + -Lblddir/src -lxmlrpc-c \
194 $(XML_PARSER_LIBDEP) \
195 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
197 --- xmlrpc-c/src/xmlrpc.pc.cmake.orig 2013-03-03 17:06:35.285532023 +0100
198 +++ xmlrpc-c/src/xmlrpc.pc.cmake 2013-03-03 17:46:37.542097875 +0100
200 Version: @XMLRPC_C_VERSION@
202 Requires.private: @xmlrpc_pkgconfig_req@ xmlrpc_util
203 -Libs: -L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@
204 +Libs: -L${libdir} -lxmlrpc-c @xmlrpc_pkgconfig_libs@
205 Cflags: -I${includedir}
206 --- xmlrpc-c-1.20.3/src/CMakeLists.txt 2009-12-05 22:06:26.335153315 +0000
207 +++ xmlrpc-c-1.20.3/src/CMakeLists.txt 2009-12-05 22:09:49.944925301 +0000
213 -add_library(xmlrpc SHARED
215 +add_library(xmlrpc-c SHARED
216 double.c parse_datetime.c parse_value.c resource.c trace.c version.c
218 xmlrpc_data.c xmlrpc_datetime.c xmlrpc_string.c
220 xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c
221 xmlrpc_base64.c xmlrpc_authcookie.c)
223 -set_target_properties(xmlrpc
224 +set_target_properties(xmlrpc-c
226 COMPILE_FLAGS ${libxml_INCLUDES})
228 ensc_pkgconfig(xmlrpc)
229 -target_link_libraries(xmlrpc ${libxml_LIBS} xmlrpc_util)
230 -list(APPEND lib_TARGETS xmlrpc)
231 +target_link_libraries(xmlrpc-c ${libxml_LIBS} xmlrpc_util)
232 +list(APPEND lib_TARGETS xmlrpc-c)
234 ### libxmlrpc_client.so
235 add_library(xmlrpc_client SHARED
236 xmlrpc_client.c xmlrpc_client_global.c xmlrpc_server_info.c ${transport_SOURCES})
238 -target_link_libraries(xmlrpc_client xmlrpc ${client_LIBS})
239 +target_link_libraries(xmlrpc_client xmlrpc-c ${client_LIBS})
240 set_target_properties(xmlrpc_client
242 COMPILE_FLAGS "${client_CFLAGS}")
244 ### libxmlrpc_server.so
245 add_library(xmlrpc_server SHARED
246 registry.c method.c system_method.c)
247 -target_link_libraries(xmlrpc_server xmlrpc)
248 +target_link_libraries(xmlrpc_server xmlrpc-c)
249 list(APPEND lib_TARGETS xmlrpc_server)
250 ensc_pkgconfig(xmlrpc_server)
252 --- xmlrpc-c/src/cpp/CMakeLists.txt.orig 2011-03-20 15:41:37.000000000 +0100
253 +++ xmlrpc-c/src/cpp/CMakeLists.txt 2011-03-20 15:42:37.524711244 +0100
255 add_library(xmlrpc++ SHARED
256 base64.cpp env_wrap.cpp fault.cpp girerr.cpp girmem.cpp
257 outcome.cpp param_list.cpp value.cpp xml.cpp)
258 -target_link_libraries(xmlrpc++ xmlrpc pthread)
259 +target_link_libraries(xmlrpc++ xmlrpc-c pthread)
260 list(APPEND lib_TARGETS xmlrpc++)
261 ensc_pkgconfig(xmlrpc++)
263 ####### libxmlrpc_cpp.so
264 add_library(xmlrpc_cpp SHARED XmlRpcCpp)
265 -target_link_libraries(xmlrpc_cpp xmlrpc xmlrpc_server xmlrpc_client)
266 +target_link_libraries(xmlrpc_cpp xmlrpc-c xmlrpc_server xmlrpc_client)
267 list(APPEND lib_TARGETS xmlrpc_cpp)
268 ensc_pkgconfig(xmlrpc_cpp)
270 --- xmlrpc-c/examples/CMakeLists.txt.orig 2011-03-20 17:08:15.832709568 +0100
271 +++ xmlrpc-c/examples/CMakeLists.txt 2011-03-20 17:12:17.396709568 +0100
273 endif(ENABLE_CPLUSPLUS)
276 -set(base_LIBS xmlrpc)
277 +set(base_LIBS xmlrpc-c)
278 ensc_add_example(json c base)
279 ensc_add_example(gen_sample_add_xml c base)
281 --- xmlrpc-c/tools/xml/CMakeLists.txt.orig 2013-03-03 17:51:15.572086205 +0100
282 +++ xmlrpc-c/tools/xml/CMakeLists.txt 2013-03-03 17:56:38.495405989 +0100
286 target_link_libraries(xmlrpc_parsecall
291 install(TARGETS xmlrpc_parsecall