commit: 453a1693e786c6e95e7963696a068ca64148a947 Author: Andrej Shadura <andrew.shadura <AT> collabora <DOT> co <DOT> uk> AuthorDate: Thu Nov 21 13:37:14 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Nov 21 15:43:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453a1693
dev-libs/xmlrpc-c: Regenerate configure instead of patching it In xmlrpc-c-1.51.06-pkg-config-libxml2.patch, we patch configure.in and then configure itself. This causes issues since the patch no longer applies to newer upstream versions even though configure.in hasn't changed. Instead of patching both configure.in *and* configure, regenerate configure from configure.in by using eautoconf. Signed-off-by: Andrej Shadura <andrew.shadura <AT> collabora.co.uk> Closes: https://github.com/gentoo/gentoo/pull/39396 Signed-off-by: Sam James <sam <AT> gentoo.org> .../xmlrpc-c-1.51.06-pkg-config-libxml2.patch | 119 --------------------- .../xmlrpc-c-1.51.06-pkg-config-openssl.patch | 24 ++--- ....54.05-r2.ebuild => xmlrpc-c-1.54.05-r3.ebuild} | 3 +- ...c-1.54.06.ebuild => xmlrpc-c-1.54.06-r1.ebuild} | 3 +- 4 files changed, 15 insertions(+), 134 deletions(-) diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch index df8d992c62d8..a62a729ec22a 100644 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch +++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch @@ -11,125 +11,6 @@ https://bugs.gentoo.org/870253 endif # LIBXMLRPC_UTIL_LIBDEP is the string of linker options you need on the link ---- a/configure -+++ b/configure -@@ -628,9 +628,8 @@ - CC_WARN_FLAGS - CXX_COMPILER_GNU - C_COMPILER_GNU -+HAVE_LIBWWW_SSL_DEFINE - ENABLE_LIBXML2_BACKEND --have_xml2_config --HAVE_LIBWWW_SSL_DEFINE - HAVE_ABYSS_OPENSSL_DEFINE - MUST_BUILD_ABYSS_OPENSSL - HAVE_OPENSSL -@@ -781,8 +780,8 @@ - enable_cplusplus - enable_abyss_threads - enable_abyss_openssl -+enable_libxml2_backend - with_libwww_ssl --enable_libxml2_backend - ' - ac_precious_vars='build_alias - host_alias -@@ -6053,62 +6053,39 @@ - fi - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Libxml2 library" >&5 -+$as_echo_n "checking for Libxml2 library... " >&6; } -+ -+if ${PKG_CONFIG} libxml-2.0; then -+ HAVE_LIBXML2=yes -+else -+ HAVE_LIBXML2=no -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LIBXML2" >&5 -+$as_echo "$HAVE_LIBXML2" >&6; } -+ -+# Check whether --enable-libxml2-backend was given. -+if test "${enable_libxml2_backend+set}" = set; then : -+ enableval=$enable_libxml2_backend; -+else -+ enable_libxml2_backend=no -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libxml2 backend" >&5 -+$as_echo_n "checking whether to build the libxml2 backend... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libxml2_backend" >&5 -+$as_echo "$enable_libxml2_backend" >&6; } -+ -+if test $enable_libxml2_backend = yes; then -+ if test $HAVE_LIBXML2 = no; then -+ as_fn_error $? "You specified --enable-libxml2_backend, but don't appear to have libxml2 installed (no pkg-config file for it in your pkg-config search path), so we cannot not build for libxml2" "$LINENO" 5 -+ fi -+fi -+ -+ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend -+ -+ --# Check whether --enable-libxml2-backend was given. --if test "${enable_libxml2_backend+set}" = set; then : -- enableval=$enable_libxml2_backend; --else -- enable_libxml2_backend=no --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libxml2 backend" >&5 --$as_echo_n "checking whether to build the libxml2 backend... " >&6; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libxml2_backend" >&5 --$as_echo "$enable_libxml2_backend" >&6; } -- --if test $enable_libxml2_backend = yes; then -- # Extract the first word of "xml2-config", so it can be a program name with args. --set dummy xml2-config; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_prog_have_xml2_config+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$have_xml2_config"; then -- ac_cv_prog_have_xml2_config="$have_xml2_config" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_have_xml2_config="yes" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_prog_have_xml2_config" && ac_cv_prog_have_xml2_config="no" --fi --fi --have_xml2_config=$ac_cv_prog_have_xml2_config --if test -n "$have_xml2_config"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xml2_config" >&5 --$as_echo "$have_xml2_config" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- if test $have_xml2_config = no; then -- as_fn_error $? "You specified --enable-libxml2_backend, but don't appear to have libxml2 installed (no working xml2-config in your command search path), so we cannot not build for libxml2" "$LINENO" 5 -- fi --fi --ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend - - - C_COMPILER_GNU=$ac_cv_c_compiler_gnu --- a/configure.in +++ b/configure.in @@ -742,6 +742,36 @@ diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch index b39ae428f29b..d893b8ee25b9 100644 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch +++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch @@ -1,22 +1,20 @@ https://sourceforge.net/p/xmlrpc-c/code/3152 https://bugs.gentoo.org/870253 ---- a/configure -+++ b/configure -@@ -5974,11 +5974,11 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL library" >&5 - $as_echo_n "checking for OpenSSL library... " >&6; } - +--- a/configure.in ++++ b/configure.in +@@ -696,11 +696,11 @@ dnl ======================================================================= + + AC_MSG_CHECKING(for OpenSSL library) + -if pkg-config openssl; then -- HAVE_OPENSSL=yes -- OPENSSL_LDADD=$(pkg-config openssl --libs) -- -- OPENSSL_CFLAGS=$(pkg-config openssl --cflags) +if ${PKG_CONFIG} openssl; then -+ HAVE_OPENSSL=yes + HAVE_OPENSSL=yes +- OPENSSL_LDADD=$(pkg-config openssl --libs) + OPENSSL_LDADD=$(${PKG_CONFIG} openssl --libs) -+ + AC_SUBST(OPENSSL_LDADD) +- OPENSSL_CFLAGS=$(pkg-config openssl --cflags) + OPENSSL_CFLAGS=$(${PKG_CONFIG} openssl --cflags) - + AC_SUBST(OPENSSL_CFLAGS) else HAVE_OPENSSL=no diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild similarity index 97% rename from dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild rename to dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild index 0bbedf6a1ee3..b3e2ddbb2651 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit toolchain-funcs +inherit autotools toolchain-funcs # Upstream maintains 3 release channels: https://xmlrpc-c.sourceforge.net/release.html # 1. Only the "Super Stable" series is released as a tarball @@ -46,6 +46,7 @@ src_prepare() { -e "/CFLAGS_COMMON/s|-g -O3$||" \ -e "/CXXFLAGS_COMMON/s|-g$||" \ common.mk || die + eautoconf } src_configure() { diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild similarity index 97% rename from dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild rename to dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild index a224c3c1a99f..184e48e2243a 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit toolchain-funcs +inherit autotools toolchain-funcs # Upstream maintains 3 release channels: https://xmlrpc-c.sourceforge.net/release.html # 1. Only the "Super Stable" series is released as a tarball @@ -48,6 +48,7 @@ src_prepare() { -e "/CFLAGS_COMMON/s|-g -O3$||" \ -e "/CXXFLAGS_COMMON/s|-g$||" \ common.mk || die + eautoconf } src_configure() {
