repo/gentoo:master commit in: dev-libs/xmlrpc-c/, dev-libs/xmlrpc-c/files/

"Sam James" <[email protected]> Tue, 04 Aug 2026 00:48:09 +0000 (UTC)
Newsgroups gmane.linux.gentoo.cvs
Message-ID <1785804333.a832cd3e0c78e52c02b2f558a88e83c5f710f2eb.sam@gentoo>
commit:     a832cd3e0c78e52c02b2f558a88e83c5f710f2eb
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Aug  3 03:34:06 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 00:45:33 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a832cd3e

dev-libs/xmlrpc-c: fix hardcoded pkg-config

reapply fix for libxml2 and openssl (rebased from 1.59.X)
fix the patch for system expat

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1607
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/xmlrpc-c-1.59.03-use-system-expat.patch  |  2 +-
 ...xmlrpc-c-1.64.03-fix_hardcoded_pkg-config.patch | 22 ++++++++++++++++++++++
 .../files/xmlrpc-c-1.64.03-use-system-expat.patch  |  2 +-
 dev-libs/xmlrpc-c/xmlrpc-c-1.64.03-r1.ebuild       |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.59.03-use-system-expat.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.59.03-use-system-expat.patch
index df25189042e5..d5ec2d0c68cd 100644
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.59.03-use-system-expat.patch
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.59.03-use-system-expat.patch
@@ -82,7 +82,7 @@ index 725c063..5251c85 100644
  CCLD = $(CC)
  CXXLD = $(CXX)
  AR = @AR@
-+PKG_CONFIG = pkg-config
++PKG_CONFIG ?= pkg-config
  RANLIB = @RANLIB@
  LN_S = ln -s
  INSTALL = $(SRCDIR)/install-sh

diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.64.03-fix_hardcoded_pkg-config.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.64.03-fix_hardcoded_pkg-config.patch
new file mode 100644
index 000000000000..a0ae9064580c
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.64.03-fix_hardcoded_pkg-config.patch
@@ -0,0 +1,22 @@
+https://sourceforge.net/p/xmlrpc-c/code/3151
+https://bugs.gentoo.org/870253
+--- a/configure.in
++++ b/configure.in
+@@ -696,7 +696,7 @@ dnl =======================================================================
+ 
+ AC_MSG_CHECKING(for OpenSSL library)
+ 
+-if pkg-config openssl; then
++if ${PKG_CONFIG} openssl; then
+   HAVE_OPENSSL=yes
+ else
+   HAVE_OPENSSL=no
+@@ -747,7 +747,7 @@ dnl =======================================================================
+ 
+ AC_MSG_CHECKING(for Libxml2 library)
+ 
+-if pkg-config libxml-2.0; then
++if ${PKG_CONFIG} libxml-2.0; then
+   HAVE_LIBXML2=yes
+ else
+   HAVE_LIBXML2=no

diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.64.03-use-system-expat.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.64.03-use-system-expat.patch
index 3c0d4347812d..fb5705d4ce8a 100644
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.64.03-use-system-expat.patch
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.64.03-use-system-expat.patch
@@ -66,7 +66,7 @@ Bug: https://bugs.gentoo.org/952113
  CCLD = $(CC)
  CXXLD = $(CXX)
  AR = @AR@
-+PKG_CONFIG = pkg-config
++PKG_CONFIG ?= pkg-config
  RANLIB = @RANLIB@
  LN_S = ln -s
  INSTALL = $(SRCDIR)/install-sh

diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.64.03-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.64.03-r1.ebuild
index 8698abf70716..ac7fbb843412 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.64.03-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.64.03-r1.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.64.03-use-stdbool.patch
 	"${FILESDIR}"/${PN}-1.64.03-use-system-expat.patch
 	"${FILESDIR}"/${PN}-1.64.03-fix-pkgconfig.patch
+	"${FILESDIR}"/${PN}-1.64.03-fix_hardcoded_pkg-config.patch
 )
 
 pkg_setup() {