rpms/xmlrpc-c
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix underlinking issue causing FTBFS

Browse Source 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2017-06-30 10:25:17 +02:00
parent c820a8d95f
commit cd1fc7a892
7 changed files with 112 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
0001-add-meson-buildsystem-definitions.patch
View File

@ -1,15 +1,15 @@
From 4eba7df6c51307be0383c6428950cabd0733a47b Mon Sep 17 00:00:00 2001
From 0ead2a9e8c4cae3ef20fe82e048da4f27468bca8 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sun, 18 Dec 2016 10:24:31 +0100
Subject: [PATCH 1/3] add meson buildsystem definitions
Subject: [PATCH 1/2] add meson buildsystem definitions
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
include/meson.build | 3 +
include/xmlrpc-c/config.h.in | 41 ++++++++
include/xmlrpc-c/config.h.in | 41 +++++++
include/xmlrpc-c/lnsfr.sh | 9 ++
include/xmlrpc-c/meson.build | 87 +++++++++++++++
lib/abyss++/meson.build | 42 ++++++++
lib/abyss++/meson.build | 43 ++++++++
lib/abyss/meson.build | 1 +
lib/abyss/src/meson.build | 66 ++++++++++++
lib/curl_transport/meson.build | 16 +++
@ -18,26 +18,26 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
lib/expat/xmlparse/meson.build | 21 ++++
lib/expat/xmltok/meson.build | 32 ++++++
lib/libutil++/meson.build | 28 +++++
lib/libutil/meson.build | 41 ++++++++
lib/libutil/meson.build | 41 +++++++
lib/meson.build | 27 +++++
lib/openssl/meson.build | 27 +++++
lib/util/meson.build | 20 ++++
meson.build | 209 +++++++++++++++++++++++++++++++++++++
meson.build | 209 ++++++++++++++++++++++++++++++++++++
meson_options.txt | 12 +++
src/cpp/meson.build | 199 +++++++++++++++++++++++++++++++++++
src/meson.build | 189 +++++++++++++++++++++++++++++++++
src/cpp/meson.build | 214 +++++++++++++++++++++++++++++++++++++
src/meson.build | 190 ++++++++++++++++++++++++++++++++
tools/lib/meson.build | 5 +
tools/meson.build | 14 +++
tools/xml-rpc-api2cpp/meson.build | 19 ++++
tools/xml-rpc-api2cpp/meson.build | 21 ++++
tools/xml-rpc-api2txt/meson.build | 2 +
tools/xml/meson.build | 15 +++
tools/xmlrpc/meson.build | 20 ++++
tools/xmlrpc_cpp_proxy/meson.build | 18 ++++
tools/xmlrpc_pstream/meson.build | 19 ++++
tools/xmlrpc_transport/meson.build | 17 +++
tools/xmlrpc_cpp_proxy/meson.build | 19 ++++
tools/xmlrpc_pstream/meson.build | 21 ++++
tools/xmlrpc_transport/meson.build | 18 ++++
transport_config.h.in | 4 +
xmlrpc-c-config | 114 ++++++++++++++++++++
32 files changed, 1336 insertions(+)
32 files changed, 1359 insertions(+)
create mode 100644 include/meson.build
create mode 100644 include/xmlrpc-c/config.h.in
create mode 100755 include/xmlrpc-c/lnsfr.sh
@ -73,7 +73,7 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
diff --git a/include/meson.build b/include/meson.build
new file mode 100644
index 00000000..ec0964c0
index 0000000..ec0964c
--- /dev/null
+++ b/include/meson.build
@@ -0,0 +1,3 @@
@ -82,7 +82,7 @@ index 00000000..ec0964c0
+subdir('xmlrpc-c')
diff --git a/include/xmlrpc-c/config.h.in b/include/xmlrpc-c/config.h.in
new file mode 100644
index 00000000..e8a633e7
index 0000000..e8a633e
--- /dev/null
+++ b/include/xmlrpc-c/config.h.in
@@ -0,0 +1,41 @@
@ -129,7 +129,7 @@ index 00000000..e8a633e7
+#endif
diff --git a/include/xmlrpc-c/lnsfr.sh b/include/xmlrpc-c/lnsfr.sh
new file mode 100755
index 00000000..83f231b7
index 0000000..83f231b
--- /dev/null
+++ b/include/xmlrpc-c/lnsfr.sh
@@ -0,0 +1,9 @@
@ -144,7 +144,7 @@ index 00000000..83f231b7
+ln -sfr "${DESTDIR}${tgt}" "${DESTDIR}${src}"
diff --git a/include/xmlrpc-c/meson.build b/include/xmlrpc-c/meson.build
new file mode 100644
index 00000000..2fe3cb90
index 0000000..2fe3cb9
--- /dev/null
+++ b/include/xmlrpc-c/meson.build
@@ -0,0 +1,87 @@
@ -237,10 +237,10 @@ index 00000000..2fe3cb90
+endforeach
diff --git a/lib/abyss++/meson.build b/lib/abyss++/meson.build
new file mode 100644
index 00000000..01aa2449
index 0000000..69f97d7
--- /dev/null
+++ b/lib/abyss++/meson.build
@@ -0,0 +1,42 @@
@@ -0,0 +1,43 @@
+if host_machine.system() == 'windows'
+ abysspp_chan_switch = 'AbyssChanSwitchWin.cpp'
+else
@ -265,6 +265,7 @@ index 00000000..01aa2449
+ ],
+ link_with : [
+ libxmlrpc_abyss,
+ libxmlrpc_util,
+ libxmlrpc_utilpp,
+ ],
+ dependencies : [
@ -279,20 +280,20 @@ index 00000000..01aa2449
+ name : 'xmlrpc_abyss++',
+ description : 'Xmlrpc-c Abyss HTTP C++ library',
+ version : meson.project_version(),
+ requires : ['xmlrpc_abyss', 'xmlrpc_util++'],
+ requires_private : ['xmlrpc_abyss', 'xmlrpc_util', 'xmlrpc_util++'],
+ libraries : libxmlrpc_abysspp,
+ install : true,
+)
diff --git a/lib/abyss/meson.build b/lib/abyss/meson.build
new file mode 100644
index 00000000..9537275d
index 0000000..9537275
--- /dev/null
+++ b/lib/abyss/meson.build
@@ -0,0 +1 @@
+subdir('src')
diff --git a/lib/abyss/src/meson.build b/lib/abyss/src/meson.build
new file mode 100644
index 00000000..747e3ac4
index 0000000..32ecdfc
--- /dev/null
+++ b/lib/abyss/src/meson.build
@@ -0,0 +1,66 @@
@ -359,12 +360,12 @@ index 00000000..747e3ac4
+ description : 'Xmlrpc-c Abyss HTTP C library',
+ version : meson.project_version(),
+ libraries : libxmlrpc_abyss,
+ requires : 'xmlrpc_util',
+ requires_private : 'xmlrpc_util',
+ install : true,
+)
diff --git a/lib/curl_transport/meson.build b/lib/curl_transport/meson.build
new file mode 100644
index 00000000..f5ff3040
index 0000000..f5ff304
--- /dev/null
+++ b/lib/curl_transport/meson.build
@@ -0,0 +1,16 @@
@ -386,7 +387,7 @@ index 00000000..f5ff3040
+)
diff --git a/lib/expat/gennmtab/meson.build b/lib/expat/gennmtab/meson.build
new file mode 100644
index 00000000..94764c22
index 0000000..94764c2
--- /dev/null
+++ b/lib/expat/gennmtab/meson.build
@@ -0,0 +1,4 @@
@ -396,7 +397,7 @@ index 00000000..94764c22
+)
diff --git a/lib/expat/meson.build b/lib/expat/meson.build
new file mode 100644
index 00000000..893f36d6
index 0000000..df9ca84
--- /dev/null
+++ b/lib/expat/meson.build
@@ -0,0 +1,15 @@
@ -408,7 +409,7 @@ index 00000000..893f36d6
+ name : 'xmlrpc_expat',
+ description : 'Xmlrpc-c XML parsing library',
+ version : meson.project_version(),
+ requires: 'xmlrpc_util',
+ requires_private: 'xmlrpc_util',
+ libraries : [
+ libxmlrpc_xmlparse,
+ libxmlrpc_xmltok,
@ -417,7 +418,7 @@ index 00000000..893f36d6
+)
diff --git a/lib/expat/xmlparse/meson.build b/lib/expat/xmlparse/meson.build
new file mode 100644
index 00000000..39c0bf26
index 0000000..39c0bf2
--- /dev/null
+++ b/lib/expat/xmlparse/meson.build
@@ -0,0 +1,21 @@
@ -444,7 +445,7 @@ index 00000000..39c0bf26
+)
diff --git a/lib/expat/xmltok/meson.build b/lib/expat/xmltok/meson.build
new file mode 100644
index 00000000..6629719c
index 0000000..6629719
--- /dev/null
+++ b/lib/expat/xmltok/meson.build
@@ -0,0 +1,32 @@
@ -482,7 +483,7 @@ index 00000000..6629719c
+xmltok_incdir = include_directories('.')
diff --git a/lib/libutil++/meson.build b/lib/libutil++/meson.build
new file mode 100644
index 00000000..2463ec3d
index 0000000..9764c08
--- /dev/null
+++ b/lib/libutil++/meson.build
@@ -0,0 +1,28 @@
@ -510,13 +511,13 @@ index 00000000..2463ec3d
+ name : 'xmlrpc_util++',
+ description : 'Xmlrpc-c C++ utility functions library',
+ version : meson.project_version(),
+ requires : 'xmlrpc_util',
+ requires_private : 'xmlrpc_util',
+ libraries : libxmlrpc_utilpp,
+ install : true,
+)
diff --git a/lib/libutil/meson.build b/lib/libutil/meson.build
new file mode 100644
index 00000000..bb1cc67d
index 0000000..bb1cc67
--- /dev/null
+++ b/lib/libutil/meson.build
@@ -0,0 +1,41 @@
@ -563,7 +564,7 @@ index 00000000..bb1cc67d
+)
diff --git a/lib/meson.build b/lib/meson.build
new file mode 100644
index 00000000..e78c1f83
index 0000000..e78c1f8
--- /dev/null
+++ b/lib/meson.build
@@ -0,0 +1,27 @@
@ -596,7 +597,7 @@ index 00000000..e78c1f83
+endif
diff --git a/lib/openssl/meson.build b/lib/openssl/meson.build
new file mode 100644
index 00000000..f83f57ac
index 0000000..f65a4dc
--- /dev/null
+++ b/lib/openssl/meson.build
@@ -0,0 +1,27 @@
@ -623,13 +624,13 @@ index 00000000..f83f57ac
+ name : 'xmlrpc_openssl',
+ description : 'Openssl convenience function from Xmlrpc-c package',
+ version : meson.project_version(),
+ requires : 'xmlrpc_util',
+ requires_private : 'xmlrpc_util',
+ libraries : libxmlrpc_openssl,
+ install : true,
+)
diff --git a/lib/util/meson.build b/lib/util/meson.build
new file mode 100644
index 00000000..4cae4926
index 0000000..4cae492
--- /dev/null
+++ b/lib/util/meson.build
@@ -0,0 +1,20 @@
@ -655,7 +656,7 @@ index 00000000..4cae4926
+endif
diff --git a/meson.build b/meson.build
new file mode 100644
index 00000000..028a5791
index 0000000..028a579
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,209 @@
@ -870,7 +871,7 @@ index 00000000..028a5791
+install_data('xmlrpc-c-config', install_dir : get_option('bindir'))
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 00000000..822e91e7
index 0000000..822e91e
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,12 @@
@ -888,10 +889,10 @@ index 00000000..822e91e7
+option('libxml2-backend', type : 'boolean', value : false, description : 'Use libxml2 instead of built-in expat')
diff --git a/src/cpp/meson.build b/src/cpp/meson.build
new file mode 100644
index 00000000..68d6ac66
index 0000000..fdc5169
--- /dev/null
+++ b/src/cpp/meson.build
@@ -0,0 +1,199 @@
@@ -0,0 +1,214 @@
+libxmlrpc_cpp = library(
+ 'xmlrpc_cpp',
+ sources : [
@ -927,6 +928,7 @@ index 00000000..68d6ac66
+ ],
+ link_with : [
+ libxmlrpc,
+ libxmlrpc_util,
+ libxmlrpc_utilpp,
+ ],
+ soversion : 8,
@ -937,7 +939,7 @@ index 00000000..68d6ac66
+ name : 'xmlrpc++',
+ description : 'Xmlrpc-c basic XML-RPC C++ library',
+ version : meson.project_version(),
+ requires : ['xmlrpc', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_util', 'xmlrpc_util++'],
+ libraries : libxmlrpcpp,
+ install : true,
+)
@ -951,8 +953,11 @@ index 00000000..68d6ac66
+ hdr_incdir,
+ ],
+ link_with : [
+ libxmlrpc,
+ libxmlrpcpp,
+ libxmlrpc_server,
+ libxmlrpc_util,
+ libxmlrpc_utilpp,
+ ],
+ soversion : 8,
+ version : '8.@0@'.format(version_minor),
@ -962,7 +967,7 @@ index 00000000..68d6ac66
+ name : 'xmlrpc_server++',
+ description : 'Xmlrpc-c XML-RPC server C++ library',
+ version : meson.project_version(),
+ requires : ['xmlrpc++', 'xmlrpc', 'xmlrpc_server', 'xmlrpc_util++', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc++', 'xmlrpc_server', 'xmlrpc_util', 'xmlrpc_utilpp'],
+ libraries : libxmlrpc_serverpp,
+ install : true,
+)
@ -980,9 +985,12 @@ index 00000000..68d6ac66
+ util_incdir,
+ ],
+ link_with : [
+ libxmlrpc_abyss,
+ libxmlrpc_abysspp,
+ libxmlrpc_serverpp,
+ libxmlrpc_server_abyss,
+ libxmlrpc_util,
+ libxmlrpc_utilpp,
+ ],
+ soversion : 8,
+ version : '8.@0@'.format(version_minor),
@ -992,7 +1000,7 @@ index 00000000..68d6ac66
+ name : 'xmlrpc_server_abyss++',
+ description : 'Xmlrpc-c Abyss XML-RPC server C++ library',
+ version : meson.project_version(),
+ requires : ['xmlrpc++', 'xmlrpc', 'xmlrpc_server++', 'xmlrpc_abyss', 'xmlrpc_util++', 'xmlrpc_util'],
+ requires_private : ['xmlrpc_abyss', 'xmlrpc_abyss++', 'xmlrpc_server++', 'xmlrpc_server_abyss', 'xmlrpc_util', 'xmlrpc_util++'],
+ libraries : libxmlrpc_server_abysspp,
+ install : true,
+ )
@ -1009,7 +1017,10 @@ index 00000000..68d6ac66
+ hdr_incdir,
+ ],
+ link_with : [
+ libxmlrpc,
+ libxmlrpcpp,
+ libxmlrpc_serverpp,
+ libxmlrpc_utilpp,
+ ],
+ soversion : 8,
+ version : '8.@0@'.format(version_minor),
@ -1029,6 +1040,7 @@ index 00000000..68d6ac66
+ ],
+ link_with : [
+ libxmlrpcpp,
+ libxmlrpc_utilpp,
+ ],
+ soversion : 8,
+ version : '8.@0@'.format(version_minor),
@ -1050,6 +1062,7 @@ index 00000000..68d6ac66
+ libxmlrpcpp,
+ libxmlrpc_serverpp,
+ libxmlrpc_packetsocket,
+ libxmlrpc_utilpp,
+ ],
+ soversion : 8,
+ version : '8.@0@'.format(version_minor),
@ -1059,7 +1072,7 @@ index 00000000..68d6ac66
+ name : 'xmlrpc_server_pstream',
+ description : 'Xmlrpc-c packet-stream XML-RPC server library',
+ version : meson.project_version(),
+ requires : ['xmlrpc++', 'xmlrpc', 'xmlrpc_server++', 'xmlrpc_util++', 'xmlrpc_util'],
+ requires_private : ['xmlrpc++', 'xmlrpc_server++', 'xmlrpc_util++'],
+ libraries : [libxmlrpc_server_pstreampp, libxmlrpc_packetsocket],
+ install : true,
+ )
@ -1082,9 +1095,12 @@ index 00000000..68d6ac66
+ util_incdir,
+ ],
+ link_with : [
+ libxmlrpc,
+ libxmlrpcpp,
+ libxmlrpc_client,
+ libxmlrpc_packetsocket,
+ libxmlrpc_util,
+ libxmlrpc_utilpp,
+ ],
+ soversion : 8,
+ version : '8.@0@'.format(version_minor),
@ -1093,24 +1109,25 @@ index 00000000..68d6ac66
+endif
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 00000000..3d7ded3c
index 0000000..8dd2248
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,189 @@
@@ -0,0 +1,190 @@
+xmlrpc_deps = []
+xmlrpc_incs = []
+xmlrpc_libs = []
+xmlrpc_libs = [libxmlrpc_util]
+xmlrpc_pkgconfig_req = ['xmlrpc_util']
+# TODO: handle clients
+
+if get_option('libxml2-backend')
+ xmlrpc_xml_parser = 'xmlrpc_libxml2.c'
+ xmlrpc_deps += [libxml2]
+ xmlrpc_pkgconfig_req = 'libxml-2.0'
+ xmlrpc_pkgconfig_req += ['libxml-2.0']
+else
+ xmlrpc_xml_parser = 'xmlrpc_expat.c'
+ xmlrpc_incs += [xmlparse_incdir]
+ xmlrpc_libs += [libxmlrpc_xmlparse]
+ xmlrpc_pkgconfig_req = 'xmlrpc_expat'
+ xmlrpc_pkgconfig_req += ['xmlrpc_expat']
+endif
+
+libxmlrpc = library(
@ -1151,7 +1168,7 @@ index 00000000..3d7ded3c
+ name : 'xmlrpc',
+ description : 'Xmlrpc-c basic XML-RPC library',
+ version : meson.project_version(),
+ requires : ['xmlrpc_util', xmlrpc_pkgconfig_req],
+ requires_private : xmlrpc_pkgconfig_req,
+ libraries : libxmlrpc,
+ install : true,
+)
@ -1180,7 +1197,7 @@ index 00000000..3d7ded3c
+ name : 'xmlrpc_server',
+ description : 'Xmlrpc-c XML-RPC server library',
+ version : meson.project_version(),
+ requires : ['xmlrpc', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_util'],
+ libraries : libxmlrpc_server,
+ install : true,
+)
@ -1211,7 +1228,7 @@ index 00000000..3d7ded3c
+ name : 'xmlrpc_server_abyss',
+ description : 'Xmlrpc-c Abyss XML-RPC server library',
+ version : meson.project_version(),
+ requires : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_abyss', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_abyss', 'xmlrpc_util'],
+ libraries : libxmlrpc_server_abyss,
+ install : true,
+ )
@ -1241,7 +1258,7 @@ index 00000000..3d7ded3c
+ name : 'xmlrpc_server_cgi',
+ description : 'Xmlrpc-c CGI XML-RPC server library',
+ version : meson.project_version(),
+ requires : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_util'],
+ libraries : libxmlrpc_server_cgi,
+ install : true,
+ )
@ -1277,7 +1294,7 @@ index 00000000..3d7ded3c
+ name : 'xmlrpc_client',
+ description : 'Xmlrpc-c XML-RPC client library',
+ version : meson.project_version(),
+ requires : ['xmlrpc', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_util'],
+ libraries : libxmlrpc_client,
+ install : true,
+ )
@ -1288,7 +1305,7 @@ index 00000000..3d7ded3c
+endif
diff --git a/tools/lib/meson.build b/tools/lib/meson.build
new file mode 100644
index 00000000..fc6929b8
index 0000000..fc6929b
--- /dev/null
+++ b/tools/lib/meson.build
@@ -0,0 +1,5 @@
@ -1299,7 +1316,7 @@ index 00000000..fc6929b8
+)
diff --git a/tools/meson.build b/tools/meson.build
new file mode 100644
index 00000000..39f73a3e
index 0000000..39f73a3
--- /dev/null
+++ b/tools/meson.build
@@ -0,0 +1,14 @@
@ -1319,10 +1336,10 @@ index 00000000..39f73a3e
+endif
diff --git a/tools/xml-rpc-api2cpp/meson.build b/tools/xml-rpc-api2cpp/meson.build
new file mode 100644
index 00000000..ce5fcd20
index 0000000..ec01212
--- /dev/null
+++ b/tools/xml-rpc-api2cpp/meson.build
@@ -0,0 +1,19 @@
@@ -0,0 +1,21 @@
+executable(
+ 'xml-rpc-api2cpp',
+ sources : [
@ -1336,15 +1353,17 @@ index 00000000..ce5fcd20
+ hdr_incdir,
+ ],
+ link_with : [
+ libxmlrpc,
+ libxmlrpc_client,
+ libxmlrpc_cpp,
+ libxmlrpc_util,
+ ],
+ install : true,
+)
+install_man('xml-rpc-api2cpp.1')
diff --git a/tools/xml-rpc-api2txt/meson.build b/tools/xml-rpc-api2txt/meson.build
new file mode 100644
index 00000000..2a0a61e8
index 0000000..2a0a61e
--- /dev/null
+++ b/tools/xml-rpc-api2txt/meson.build
@@ -0,0 +1,2 @@
@ -1352,7 +1371,7 @@ index 00000000..2a0a61e8
+install_man('xml-rpc-api2txt.1')
diff --git a/tools/xml/meson.build b/tools/xml/meson.build
new file mode 100644
index 00000000..2d856c60
index 0000000..2d856c6
--- /dev/null
+++ b/tools/xml/meson.build
@@ -0,0 +1,15 @@
@ -1373,7 +1392,7 @@ index 00000000..2d856c60
+)
diff --git a/tools/xmlrpc/meson.build b/tools/xmlrpc/meson.build
new file mode 100644
index 00000000..e1e8d552
index 0000000..e1e8d55
--- /dev/null
+++ b/tools/xmlrpc/meson.build
@@ -0,0 +1,20 @@
@ -1399,10 +1418,10 @@ index 00000000..e1e8d552
+)
diff --git a/tools/xmlrpc_cpp_proxy/meson.build b/tools/xmlrpc_cpp_proxy/meson.build
new file mode 100644
index 00000000..66ebd575
index 0000000..f3fc998
--- /dev/null
+++ b/tools/xmlrpc_cpp_proxy/meson.build
@@ -0,0 +1,18 @@
@@ -0,0 +1,19 @@
+executable(
+ 'xmlrpc_cpp_proxy',
+ sources : [
@ -1418,15 +1437,16 @@ index 00000000..66ebd575
+ link_with : [
+ libxmlrpcpp,
+ libxmlrpc_clientpp,
+ libxmlrpc_utilpp,
+ ],
+ install : true,
+)
diff --git a/tools/xmlrpc_pstream/meson.build b/tools/xmlrpc_pstream/meson.build
new file mode 100644
index 00000000..6ee5e7d7
index 0000000..9cd3eb8
--- /dev/null
+++ b/tools/xmlrpc_pstream/meson.build
@@ -0,0 +1,19 @@
@@ -0,0 +1,21 @@
+executable(
+ 'xmlrpc_pstream',
+ sources : [
@ -1442,16 +1462,18 @@ index 00000000..6ee5e7d7
+ hdr_incdir,
+ ],
+ link_with : [
+ libxmlrpcpp,
+ libxmlrpc_clientpp,
+ libxmlrpc_utilpp,
+ ],
+ install : true,
+)
diff --git a/tools/xmlrpc_transport/meson.build b/tools/xmlrpc_transport/meson.build
new file mode 100644
index 00000000..9d7d0afd
index 0000000..cbb6f83
--- /dev/null
+++ b/tools/xmlrpc_transport/meson.build
@@ -0,0 +1,17 @@
@@ -0,0 +1,18 @@
+executable(
+ 'xmlrpc_transport',
+ sources : [
@ -1466,12 +1488,13 @@ index 00000000..9d7d0afd
+ ],
+ link_with : [
+ libxmlrpc_client,
+ libxmlrpc_util,
+ ],
+ install : true,
+)
diff --git a/transport_config.h.in b/transport_config.h.in
new file mode 100644
index 00000000..687fdaf2
index 0000000..687fdaf
--- /dev/null
+++ b/transport_config.h.in
@@ -0,0 +1,4 @@
@ -1481,7 +1504,7 @@ index 00000000..687fdaf2
+static const char * const XMLRPC_DEFAULT_TRANSPORT = @XMLRPC_DEFAULT_TRANSPORT@;
diff --git a/xmlrpc-c-config b/xmlrpc-c-config
new file mode 100755
index 00000000..25f95194
index 0000000..25f9519
--- /dev/null
+++ b/xmlrpc-c-config
@@ -0,0 +1,114 @@
@ -1600,5 +1623,5 @@ index 00000000..25f95194
+
+exec pkg-config "$@" $comp
--
2.11.0
2.13.1

6
0001-xmlrpc_server_abyss-use-va_args-properly.patch
View File

@ -1,4 +1,4 @@
From 3c84b3078c8d55ad9e24dc1dc28a2c9fd311933f Mon Sep 17 00:00:00 2001
From d31c2ffbf5181053330fa32e4f03c47283bd1448 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sat, 17 Dec 2016 10:28:31 +0100
Subject: [PATCH 1/3] xmlrpc_server_abyss: use va_args properly
@ -17,7 +17,7 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c
index 8aacb4b5..58f5ba04 100644
index 8aacb4b..58f5ba0 100644
--- a/src/xmlrpc_server_abyss.c
+++ b/src/xmlrpc_server_abyss.c
@@ -780,7 +780,7 @@ createServer(xmlrpc_env * const envP,
@ -30,5 +30,5 @@ index 8aacb4b5..58f5ba04 100644
}
}
--
2.11.0
2.13.1

10
0002-Use-proper-datatypes-for-long-long.patch
View File

@ -1,4 +1,4 @@
From c6e5d65bf18760b339abb9deaa2169f428e5c969 Mon Sep 17 00:00:00 2001
From aca713786debd68c81a823c5989afb3de82da45b Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Sat, 5 Apr 2008 11:41:34 +0200
Subject: [PATCH 2/3] Use proper datatypes for 'long long'
@ -22,7 +22,7 @@ for now, the patch uses datatypes with exact widths.
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/xmlrpc-c/base.h b/include/xmlrpc-c/base.h
index e74e2c51..90f2c918 100644
index e74e2c5..90f2c91 100644
--- a/include/xmlrpc-c/base.h
+++ b/include/xmlrpc-c/base.h
@@ -5,6 +5,7 @@
@ -55,7 +55,7 @@ index e74e2c51..90f2c918 100644
diff --git a/lib/libutil/string_number.c b/lib/libutil/string_number.c
index 1c284afd..a7e78ad7 100644
index 1c284af..a7e78ad 100644
--- a/lib/libutil/string_number.c
+++ b/lib/libutil/string_number.c
@@ -6,6 +6,7 @@
@ -67,7 +67,7 @@ index 1c284afd..a7e78ad7 100644
#include <xmlrpc-c/base.h>
diff --git a/src/cpp/param_list.cpp b/src/cpp/param_list.cpp
index 1f7ae41f..60f7df9b 100644
index 1f7ae41..60f7df9 100644
--- a/src/cpp/param_list.cpp
+++ b/src/cpp/param_list.cpp
@@ -277,7 +277,7 @@ paramList::getI8(unsigned int const paramNumber,
@ -80,5 +80,5 @@ index 1f7ae41f..60f7df9b 100644
if (longlongvalue < minimum)
--
2.11.0
2.13.1

178
0002-build-use-Requires.private-in-pkgconfig-and-reduce-n.patch
View File

@ -1,178 +0,0 @@
From 28dac71bb97a32867575110087f4bd2184d9cfbb Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sun, 18 Dec 2016 15:48:02 +0100
Subject: [PATCH 2/3] build: use Requires.private in pkgconfig and reduce
number of requires
* if we put dependencies into requires, end-user library is linked
against all of them automatically which is not best idea
* pkg-config automatically does dependency resolving automatically,
so we don't really need to write ton of requires
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
lib/abyss++/meson.build | 2 +-
lib/abyss/src/meson.build | 2 +-
lib/expat/meson.build | 2 +-
lib/libutil++/meson.build | 2 +-
lib/openssl/meson.build | 2 +-
src/cpp/meson.build | 8 ++++----
src/meson.build | 10 +++++-----
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/abyss++/meson.build b/lib/abyss++/meson.build
index 01aa2449..ff79f661 100644
--- a/lib/abyss++/meson.build
+++ b/lib/abyss++/meson.build
@@ -36,7 +36,7 @@ pkgg.generate(
name : 'xmlrpc_abyss++',
description : 'Xmlrpc-c Abyss HTTP C++ library',
version : meson.project_version(),
- requires : ['xmlrpc_abyss', 'xmlrpc_util++'],
+ requires_private : ['xmlrpc_abyss', 'xmlrpc_util++'],
libraries : libxmlrpc_abysspp,
install : true,
)
diff --git a/lib/abyss/src/meson.build b/lib/abyss/src/meson.build
index 747e3ac4..32ecdfca 100644
--- a/lib/abyss/src/meson.build
+++ b/lib/abyss/src/meson.build
@@ -61,6 +61,6 @@ pkgg.generate(
description : 'Xmlrpc-c Abyss HTTP C library',
version : meson.project_version(),
libraries : libxmlrpc_abyss,
- requires : 'xmlrpc_util',
+ requires_private : 'xmlrpc_util',
install : true,
)
diff --git a/lib/expat/meson.build b/lib/expat/meson.build
index 893f36d6..df9ca84c 100644
--- a/lib/expat/meson.build
+++ b/lib/expat/meson.build
@@ -6,7 +6,7 @@ pkgg.generate(
name : 'xmlrpc_expat',
description : 'Xmlrpc-c XML parsing library',
version : meson.project_version(),
- requires: 'xmlrpc_util',
+ requires_private: 'xmlrpc_util',
libraries : [
libxmlrpc_xmlparse,
libxmlrpc_xmltok,
diff --git a/lib/libutil++/meson.build b/lib/libutil++/meson.build
index 2463ec3d..9764c08d 100644
--- a/lib/libutil++/meson.build
+++ b/lib/libutil++/meson.build
@@ -22,7 +22,7 @@ pkgg.generate(
name : 'xmlrpc_util++',
description : 'Xmlrpc-c C++ utility functions library',
version : meson.project_version(),
- requires : 'xmlrpc_util',
+ requires_private : 'xmlrpc_util',
libraries : libxmlrpc_utilpp,
install : true,
)
diff --git a/lib/openssl/meson.build b/lib/openssl/meson.build
index f83f57ac..f65a4dc1 100644
--- a/lib/openssl/meson.build
+++ b/lib/openssl/meson.build
@@ -21,7 +21,7 @@ pkgg.generate(
name : 'xmlrpc_openssl',
description : 'Openssl convenience function from Xmlrpc-c package',
version : meson.project_version(),
- requires : 'xmlrpc_util',
+ requires_private : 'xmlrpc_util',
libraries : libxmlrpc_openssl,
install : true,
)
diff --git a/src/cpp/meson.build b/src/cpp/meson.build
index 68d6ac66..5152a9a8 100644
--- a/src/cpp/meson.build
+++ b/src/cpp/meson.build
@@ -43,7 +43,7 @@ pkgg.generate(
name : 'xmlrpc++',
description : 'Xmlrpc-c basic XML-RPC C++ library',
version : meson.project_version(),
- requires : ['xmlrpc', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_util++'],
libraries : libxmlrpcpp,
install : true,
)
@@ -68,7 +68,7 @@ pkgg.generate(
name : 'xmlrpc_server++',
description : 'Xmlrpc-c XML-RPC server C++ library',
version : meson.project_version(),
- requires : ['xmlrpc++', 'xmlrpc', 'xmlrpc_server', 'xmlrpc_util++', 'xmlrpc_util'],
+ requires_private : ['xmlrpc++', 'xmlrpc_server'],
libraries : libxmlrpc_serverpp,
install : true,
)
@@ -98,7 +98,7 @@ if get_option('abyss-server')
name : 'xmlrpc_server_abyss++',
description : 'Xmlrpc-c Abyss XML-RPC server C++ library',
version : meson.project_version(),
- requires : ['xmlrpc++', 'xmlrpc', 'xmlrpc_server++', 'xmlrpc_abyss', 'xmlrpc_util++', 'xmlrpc_util'],
+ requires_private : ['xmlrpc_abyss++', 'xmlrpc_server++', 'xmlrpc_server_abyss'],
libraries : libxmlrpc_server_abysspp,
install : true,
)
@@ -165,7 +165,7 @@ if build_xmlrpc_pstream
name : 'xmlrpc_server_pstream',
description : 'Xmlrpc-c packet-stream XML-RPC server library',
version : meson.project_version(),
- requires : ['xmlrpc++', 'xmlrpc', 'xmlrpc_server++', 'xmlrpc_util++', 'xmlrpc_util'],
+ requires_private : ['xmlrpc++', 'xmlrpc_server++'],
libraries : [libxmlrpc_server_pstreampp, libxmlrpc_packetsocket],
install : true,
)
diff --git a/src/meson.build b/src/meson.build
index 3d7ded3c..3d76b2e3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -52,7 +52,7 @@ pkgg.generate(
name : 'xmlrpc',
description : 'Xmlrpc-c basic XML-RPC library',
version : meson.project_version(),
- requires : ['xmlrpc_util', xmlrpc_pkgconfig_req],
+ requires_private : xmlrpc_pkgconfig_req,
libraries : libxmlrpc,
install : true,
)
@@ -81,7 +81,7 @@ pkgg.generate(
name : 'xmlrpc_server',
description : 'Xmlrpc-c XML-RPC server library',
version : meson.project_version(),
- requires : ['xmlrpc', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_util'],
libraries : libxmlrpc_server,
install : true,
)
@@ -112,7 +112,7 @@ if get_option('abyss-server')
name : 'xmlrpc_server_abyss',
description : 'Xmlrpc-c Abyss XML-RPC server library',
version : meson.project_version(),
- requires : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_abyss', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_abyss', 'xmlrpc_util'],
libraries : libxmlrpc_server_abyss,
install : true,
)
@@ -142,7 +142,7 @@ if get_option('cgi-server')
name : 'xmlrpc_server_cgi',
description : 'Xmlrpc-c CGI XML-RPC server library',
version : meson.project_version(),
- requires : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_server', 'xmlrpc_util'],
libraries : libxmlrpc_server_cgi,
install : true,
)
@@ -178,7 +178,7 @@ if build_client
name : 'xmlrpc_client',
description : 'Xmlrpc-c XML-RPC client library',
version : meson.project_version(),
- requires : ['xmlrpc', 'xmlrpc_util'],
+ requires_private : ['xmlrpc', 'xmlrpc_util'],
libraries : libxmlrpc_client,
install : true,
)
--
2.11.0

6
0003-chmod-x-xml-rpc-api2txt.patch → 0002-chmod-x-xml-rpc-api2txt.patch
View File

@ -1,7 +1,7 @@
From fb2977567eb12b7bec00767cb7b900d0ecd9f131 Mon Sep 17 00:00:00 2001
From 7c5cfaea975d422bd4d5f1dfa0d688241678edf9 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mon, 19 Dec 2016 21:33:47 +0100
Subject: [PATCH 3/3] chmod +x xml-rpc-api2txt
Subject: [PATCH 2/2] chmod +x xml-rpc-api2txt
It's script which is installing into $bindir, so it must be executable.
@ -15,5 +15,5 @@ diff --git a/tools/xml-rpc-api2txt/xml-rpc-api2txt b/tools/xml-rpc-api2txt/xml-r
old mode 100644
new mode 100755
--
2.11.0
2.13.1

6
0003-allow-30x-redirections.patch
View File

@ -1,4 +1,4 @@
From 5a63ce269e597d0ca490f4c96c029a24c756e471 Mon Sep 17 00:00:00 2001
From 9bb040a9ae29e1b5afcb674c74f107114b316818 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Thu, 29 Jul 2010 19:25:32 +0200
Subject: [PATCH 3/3] allow 30x redirections
@ -8,7 +8,7 @@ Subject: [PATCH 3/3] allow 30x redirections
1 file changed, 4 insertions(+)
diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c
index f0aafae8..b5392a9f 100644
index f0aafae..b5392a9 100644
--- a/lib/curl_transport/curltransaction.c
+++ b/lib/curl_transport/curltransaction.c
@@ -671,6 +671,10 @@ setupCurlSession(xmlrpc_env * const envP,
@ -23,5 +23,5 @@ index f0aafae8..b5392a9f 100644
if (!envP->fault_occurred) {
curl_easy_setopt(curlSessionP, CURLOPT_POSTFIELDS,
--
2.11.0
2.13.1

8
xmlrpc-c.spec
View File

@ -6,7 +6,7 @@
Name: xmlrpc-c
Version: 1.48.0
Release: 4%{?dist}
Release: 5%{?dist}
Summary: A lightweight RPC library based on XML and HTTP
# See doc/COPYING for details.
# The Python 1.5.2 license used by a few files is just BSD.
@ -27,8 +27,7 @@ Patch103: 0003-allow-30x-redirections.patch
# Meson buildsystem, see https://blogs.gnome.org/ignatenko/2016/12/17/meson-%E2%99%A5-xmlrpc-c/
Patch1001: 0001-add-meson-buildsystem-definitions.patch
Patch1002: 0002-build-use-Requires.private-in-pkgconfig-and-reduce-n.patch
Patch1003: 0003-chmod-x-xml-rpc-api2txt.patch
Patch1002: 0002-chmod-x-xml-rpc-api2txt.patch
BuildRequires: git-core
BuildRequires: meson >= 0.36.0
@ -193,6 +192,9 @@ This package contains some handy XML-RPC demo applications.
%{_bindir}/xmlrpc_pstream
%changelog
* Fri Jun 30 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.48.0-5
- Fix underlinking issue causing FTBFS
* Mon Mar 13 2017 Peter Robinson <pbrobinson@fedoraproject.org> 1.48.0-4
- Build with openssl 1.1