rpms/xmlrpc-c
7
0
Fork 0
Code Issues Pull Requests Releases Activity
46bffbbc77
xmlrpc-c/0002-build-use-Requires.private-in-pkgconfig-and-reduce-n.patch
Igor Gnatenko 5c1623f34b Update to 1.48.0 
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2017-01-21 10:49:13 +01:00

179 lines
6.4 KiB
Diff
Raw Blame History

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
Reference in New Issue View Git Blame Copy Permalink