]> git.pld-linux.org Git - packages/xmlrpc-c.git/blame - xmlrpc-c-soname.patch
projects / packages / xmlrpc-c.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
rediff patches
[packages/xmlrpc-c.git] / xmlrpc-c-soname.patch
CommitLineData
6df01d66
JB		 1--- xmlrpc-c-1.39.12/src/Makefile.orig 2014-12-28 19:55:09.000000000 +0100
2+++ xmlrpc-c-1.39.12/src/Makefile 2018-02-18 21:01:54.376804414 +0100
47807b49
JB		 3@@ -15,7 +15,7 @@
4 SUBDIRS += cpp
c9d83a5c
AM		 5 endif
6
47807b49
JB		 7-TARGET_LIBRARY_NAMES := libxmlrpc libxmlrpc_server
8+TARGET_LIBRARY_NAMES := libxmlrpc-c libxmlrpc_server
9
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
91f35318 12@@ -155,7 +155,7 @@
47807b49
JB		 13 # shlibfn generates e.g. libxmlrpc.so.3.1
14 # shliblefn generates e.g. libxmlrpc.so
15
16-LIBXMLRPC = $(call shlibfn, libxmlrpc)
17+LIBXMLRPC = $(call shlibfn, libxmlrpc-c)
18
19 $(LIBXMLRPC): $(LIBXMLRPC_MODS:%=%.osh) \
20 $(LIBXMLRPC_UTIL) \
91f35318 21@@ -170,10 +170,10 @@
47807b49
JB		 22 $(LIBXMLRPC_SERVER): \
23 $(LIBXMLRPC_SERVER_MODS:%=%.osh) \
24 $(LIBXMLRPC_UTIL) \
25- $(call shliblefn, libxmlrpc)
26+ $(call shliblefn, libxmlrpc-c)
27 $(LIBXMLRPC_SERVER): LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.osh)
28 $(LIBXMLRPC_SERVER): LIBDEP = \
6df01d66
JB		 29- -L. -lxmlrpc $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
30+ -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
3f795e80
KK		 31
32 LIBXMLRPC_SERVER_ABYSS = $(call shlibfn, libxmlrpc_server_abyss)
33
91f35318 34@@ -182,12 +182,12 @@
47807b49
JB		 35 $(LIBXMLRPC_UTIL) \
36 $(LIBXMLRPC_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 = \
3f795e80
KK		 42 -L. -lxmlrpc_server \
43 -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
6df01d66
JB		 44- -L. -lxmlrpc $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
45+ -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
91f35318
JB		 46 ifeq ($(MSVCRT),yes)
47 $(LIBXMLRPC_SERVER_ABYSS): LIBDEP += -lws2_32 -lwsock32
48 endif
49@@ -198,11 +198,11 @@
47807b49
JB		 50 $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh) \
51 $(LIBXMRPC_UTIL) \
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 = \
65007067 57 -L. -lxmlrpc_server \
6df01d66
JB		 58- -L. -lxmlrpc $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
59+ -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
3f795e80
KK		 60
61 LIBXMLRPC_CLIENT = $(call shlibfn, libxmlrpc_client)
62
91f35318 63@@ -210,7 +210,7 @@
47807b49
JB		 64 $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \
65 $(TRANSPORT_MODS:%=%.osh) \
66 $(LIBXMLRPC_UTIL) \
67- $(call shliblefn, libxmlrpc)
68+ $(call shliblefn, libxmlrpc-c)
69 $(LIBXMLRPC_CLIENT): LIBOBJECTS = \
70 $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \
71 $(TRANSPORT_MODS:%=%.osh)
91f35318
JB		 72@@ -226,7 +226,7 @@
73
74 LIBXMLRPC_CLIENT_LIBDEP = \
75 -Lblddir/src -Lblddir/lib/libutil \
76- -lxmlrpc -lxmlrpc_util \
77+ -lxmlrpc-c -lxmlrpc_util \
78 $(XML_PARSER_LIBDEP) \
65007067 79 $(TRANSPORT_LIBDEP) \
91f35318
JB		 80
81@@ -235,8 +235,8 @@
82 $(LIBXMLRPC_CLIENT): LIBDEP += -lws2_32 -lwsock32 -lpthread
83 endif
47807b49
JB		 84
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)
89
90 libxmlrpc_server.a: $(LIBXMLRPC_SERVER_MODS:%=%.o)
91 libxmlrpc_server.a: LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.o)
65007067
ER		 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
47807b49
JB		 94@@ -142,7 +142,7 @@
95 ifneq ($(OMIT_XMLRPC_LIB_RULE),Y)
c9d83a5c 96
47807b49
JB		 97 LIBXMLRPC = \
98- $(call shliblefn, $(BLDDIR)/src/libxmlrpc)
99+ $(call shliblefn, $(BLDDIR)/src/libxmlrpc-c)
100 LIBXMLRPC_CLIENT = \
101 $(call shliblefn, $(BLDDIR)/src/libxmlrpc_client)
102 LIBXMLRPC_SERVER = \
103@@ -152,7 +152,7 @@
104 LIBXMLRPC_SERVER_CGI = \
105 $(call shliblefn, $(BLDDIR)/src/libxmlrpc_server_cgi)
106
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
6df01d66
JB		 112--- xmlrpc-c-1.39.12/xmlrpc-c-config.main.orig 2018-02-18 18:00:53.710261758 +0100
113+++ xmlrpc-c-1.39.12/xmlrpc-c-config.main 2018-02-18 21:02:28.870137355 +0100
114@@ -46,7 +46,7 @@
47807b49
JB		 115
116 the_libdirs="-L$LIBINST_DIR $the_libdirs"
698b9077 117
6df01d66
JB		 118-the_libs="-lxmlrpc ${LIBXML} -lxmlrpc_util -lpthread"
119+the_libs="-lxmlrpc-c ${LIBXML} -lxmlrpc_util -lpthread"
47807b49
JB		 120 the_rpath="-R$LIBINST_DIR $the_rpath"
121 the_wl_rpath="-Wl,-rpath,$LIBINST_DIR $the_wl_rpath"
122
f9f29687
JP		 123--- xmlrpc-c-1.39.13/src/cpp/Makefile.orig 2023-12-13 18:15:52.748772893 +0100
124+++ xmlrpc-c-1.39.13/src/cpp/Makefile 2023-12-13 18:21:03.576428850 +0100
125@@ -122,7 +122,7 @@
65007067
ER		 126 $(LIBXMLRPC_UTIL)
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) \
f9f29687 132 $(LIBXMLRPC_UTIL_LIBDEP) \
65007067 133
f9f29687 134@@ -136,7 +136,7 @@
65007067 135 $(LIBXMLRPCPP_SH): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh)
f9f29687 136
65007067
ER		 137 $(LIBXMLRPCPP_SH): LIBDEP = \
138- -Lblddir/src -lxmlrpc \
139+ -Lblddir/src -lxmlrpc-c \
140 $(XML_PARSER_LIBDEP) \
f9f29687
JP		 141 -L$(LIBXMLRPC_UTILPP_DIR) -lxmlrpc_util++ \
142 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
143@@ -153,7 +153,7 @@
65007067
ER		 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) \
f9f29687
JP		 150 -L$(LIBXMLRPC_UTILPP_DIR) -lxmlrpc_util++ \
151 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
152@@ -176,7 +176,7 @@
65007067
ER		 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 \
f9f29687
JP		 160 -L$(LIBXMLRPC_UTILPP_DIR) -lxmlrpc_util++ \
161@@ -195,7 +195,7 @@
65007067
ER		 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) \
f9f29687
JP		 168 -L$(LIBXMLRPC_UTILPP_DIR) -lxmlrpc_util++ \
169 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
170@@ -214,7 +214,7 @@
65007067
ER		 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) \
f9f29687 177 -L$(LIBXMLRPC_UTILPP_DIR) -lxmlrpc_util++ \
65007067 178 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
f9f29687 179@@ -237,7 +237,7 @@
65007067
ER		 180 $(LIBXMLRPC_CLIENTPP_SH): LIBDEP = \
181 -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket \
91f35318 182 $(shell cat blddir/src/libxmlrpc_client.ldflags) \
65007067
ER		 183- -Lblddir/src -lxmlrpc_client -lxmlrpc \
184+ -Lblddir/src -lxmlrpc_client -lxmlrpc-c \
185 $(XML_PARSER_LIBDEP) \
f9f29687
JP		 186 -L$(LIBXMLRPC_UTILPP_DIR) -lxmlrpc_util++ \
187 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
188@@ -253,7 +253,7 @@
65007067
ER		 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) \
f9f29687
JP		 195 -L$(LIBXMLRPC_UTILPP_DIR) -lxmlrpc_util++ \
196 -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
91f35318
JB		 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
65007067
ER		 199@@ -8,5 +8,5 @@
200 Version: @XMLRPC_C_VERSION@
201
202 Requires.private: @xmlrpc_pkgconfig_req@ xmlrpc_util
91f35318
JB		 203-Libs: -L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@
204+Libs: -L${libdir} -lxmlrpc-c @xmlrpc_pkgconfig_libs@
65007067 205 Cflags: -I${includedir}
6df01d66
JB		 206--- xmlrpc-c-1.39.12/src/CMakeLists.txt.orig 2018-02-25 15:31:16.940125278 +0100
207+++ xmlrpc-c-1.39.12/src/CMakeLists.txt 2018-02-25 15:35:10.696789278 +0100
208@@ -48,8 +48,8 @@
65007067
ER		 209
210
211
212-### libxmlrpc.so
213-add_library(xmlrpc SHARED
214+### libxmlrpc-c.so
215+add_library(xmlrpc-c SHARED
6df01d66
JB		 216 base_global.c double.c parse_datetime.c parse_value.c resource.c trace.c version.c
217 json.c
65007067 218 ${xmlrpc_xml_parser}
6df01d66 219@@ -58,19 +58,19 @@
65007067 220 xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c
6df01d66 221 xmlrpc_authcookie.c)
65007067
ER		 222
223-set_target_properties(xmlrpc
224+set_target_properties(xmlrpc-c
225 PROPERTIES
226 COMPILE_FLAGS ${libxml_INCLUDES})
227
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)
233
234 ### libxmlrpc_client.so
235 add_library(xmlrpc_client SHARED
236 xmlrpc_client.c xmlrpc_client_global.c xmlrpc_server_info.c ${transport_SOURCES})
237
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
241 PROPERTIES
242 COMPILE_FLAGS "${client_CFLAGS}")
6df01d66 243@@ -80,7 +80,7 @@
65007067
ER		 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)
251
6df01d66
JB		 252--- xmlrpc-c-1.39.12/src/cpp/CMakeLists.txt.orig 2018-02-25 15:31:16.956791945 +0100
253+++ xmlrpc-c-1.39.12/src/cpp/CMakeLists.txt 2018-02-25 15:37:15.140121190 +0100
65007067
ER		 254@@ -4,13 +4,13 @@
255 add_library(xmlrpc++ SHARED
6df01d66 256 fault.cpp global.cpp
65007067 257 outcome.cpp param_list.cpp value.cpp xml.cpp)
6df01d66
JB		 258-target_link_libraries(xmlrpc++ xmlrpc_util++ xmlrpc pthread)
259+target_link_libraries(xmlrpc++ xmlrpc_util++ xmlrpc-c pthread)
65007067
ER		 260 list(APPEND lib_TARGETS xmlrpc++)
261 ensc_pkgconfig(xmlrpc++)
262
263 ####### libxmlrpc_cpp.so
264 add_library(xmlrpc_cpp SHARED XmlRpcCpp)
6df01d66
JB		 265-target_link_libraries(xmlrpc_cpp xmlrpc xmlrpc_server)
266+target_link_libraries(xmlrpc_cpp xmlrpc-c xmlrpc_server)
65007067
ER		 267 list(APPEND lib_TARGETS xmlrpc_cpp)
268 ensc_pkgconfig(xmlrpc_cpp)
698b9077 269
3671422b
JB		 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
272@@ -21,7 +21,7 @@
273 endif(ENABLE_CPLUSPLUS)
274
275
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)
f9f29687 280 ensc_add_example(parse_xml c base)
91f35318
JB		 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
283@@ -5,7 +5,7 @@
284 ../lib/dumpvalue.c)
285
286 target_link_libraries(xmlrpc_parsecall
287- xmlrpc
288+ xmlrpc-c
289 util)
290
291 install(TARGETS xmlrpc_parsecall
XML-RPC C library - an implementation of the xmlrpc protocol
This page took 0.155927 seconds and 4 git commands to generate.