From 453a1693e786c6e95e7963696a068ca64148a947 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 21 Nov 2024 14:37:14 +0100 Subject: 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 Closes: https://github.com/gentoo/gentoo/pull/39396 Signed-off-by: Sam James --- .../xmlrpc-c-1.51.06-pkg-config-libxml2.patch | 119 --------------------- .../xmlrpc-c-1.51.06-pkg-config-openssl.patch | 24 ++--- dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild | 78 -------------- dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild | 79 ++++++++++++++ dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild | 81 ++++++++++++++ dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild | 80 -------------- 6 files changed, 171 insertions(+), 290 deletions(-) delete mode 100644 dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild create mode 100644 dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild create mode 100644 dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild delete mode 100644 dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild (limited to 'dev-libs/xmlrpc-c') 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-r2.ebuild deleted file mode 100644 index 0bbedf6a1ee3..000000000000 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit 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 -# 2. SVN tagging of releases seems spotty: https://svn.code.sf.net/p/xmlrpc-c/code/release_number/ -# Because of this, we are following the "Super Stable" release channel - -DESCRIPTION="A lightweight RPC library based on XML and HTTP" -HOMEPAGE="https://xmlrpc-c.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" - -LICENSE="BSD" -SLOT="0/4.54" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -IUSE="abyss +cgi +curl +cxx +libxml2 threads test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( abyss curl cxx )" - -RDEPEND=" - sys-libs/ncurses:= - sys-libs/readline:= - curl? ( net-misc/curl ) - libxml2? ( dev-libs/libxml2 ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch - "${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch -) - -pkg_setup() { - use curl || ewarn "Curl support disabled: No client library will be built" -} - -src_prepare() { - default - - sed -i \ - -e "/CFLAGS_COMMON/s|-g -O3$||" \ - -e "/CXXFLAGS_COMMON/s|-g$||" \ - common.mk || die -} - -src_configure() { - tc-export PKG_CONFIG - - econf \ - --disable-libwww-client \ - --disable-wininet-client \ - --without-libwww-ssl \ - $(use_enable abyss abyss-server) \ - $(use_enable cgi cgi-server) \ - $(use_enable curl curl-client) \ - $(use_enable cxx cplusplus) \ - $(use_enable libxml2 libxml2-backend) \ - $(use_enable threads abyss-threads) -} - -src_compile() { - default - - # Tools building is broken in this release - #use tools && emake -rC "${S}"/tools -} - -src_install() { - default - - # Tools building is broken in this release - #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install -} diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild new file mode 100644 index 000000000000..b3e2ddbb2651 --- /dev/null +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 +# 2. SVN tagging of releases seems spotty: https://svn.code.sf.net/p/xmlrpc-c/code/release_number/ +# Because of this, we are following the "Super Stable" release channel + +DESCRIPTION="A lightweight RPC library based on XML and HTTP" +HOMEPAGE="https://xmlrpc-c.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" + +LICENSE="BSD" +SLOT="0/4.54" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +IUSE="abyss +cgi +curl +cxx +libxml2 threads test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( abyss curl cxx )" + +RDEPEND=" + sys-libs/ncurses:= + sys-libs/readline:= + curl? ( net-misc/curl ) + libxml2? ( dev-libs/libxml2 ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch + "${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch +) + +pkg_setup() { + use curl || ewarn "Curl support disabled: No client library will be built" +} + +src_prepare() { + default + + sed -i \ + -e "/CFLAGS_COMMON/s|-g -O3$||" \ + -e "/CXXFLAGS_COMMON/s|-g$||" \ + common.mk || die + eautoconf +} + +src_configure() { + tc-export PKG_CONFIG + + econf \ + --disable-libwww-client \ + --disable-wininet-client \ + --without-libwww-ssl \ + $(use_enable abyss abyss-server) \ + $(use_enable cgi cgi-server) \ + $(use_enable curl curl-client) \ + $(use_enable cxx cplusplus) \ + $(use_enable libxml2 libxml2-backend) \ + $(use_enable threads abyss-threads) +} + +src_compile() { + default + + # Tools building is broken in this release + #use tools && emake -rC "${S}"/tools +} + +src_install() { + default + + # Tools building is broken in this release + #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install +} diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild new file mode 100644 index 000000000000..184e48e2243a --- /dev/null +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 +# 2. SVN tagging of releases seems spotty: https://svn.code.sf.net/p/xmlrpc-c/code/release_number/ +# Because of this, we are following the "Super Stable" release channel + +DESCRIPTION="A lightweight RPC library based on XML and HTTP" +HOMEPAGE="https://xmlrpc-c.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" + +LICENSE="BSD" +SLOT="0/4.54" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +IUSE="abyss +cgi +curl +cxx +libxml2 threads test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( abyss curl cxx )" + +RDEPEND=" + dev-libs/openssl:= + sys-libs/ncurses:= + sys-libs/readline:= + curl? ( net-misc/curl ) + libxml2? ( dev-libs/libxml2 ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch + "${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch + "${FILESDIR}"/${PN}-1.54.06-wformat-security.patch +) + +pkg_setup() { + use curl || ewarn "Curl support disabled: No client library will be built" +} + +src_prepare() { + default + + sed -i \ + -e "/CFLAGS_COMMON/s|-g -O3$||" \ + -e "/CXXFLAGS_COMMON/s|-g$||" \ + common.mk || die + eautoconf +} + +src_configure() { + tc-export PKG_CONFIG + + econf \ + --disable-libwww-client \ + --disable-wininet-client \ + --without-libwww-ssl \ + $(use_enable abyss abyss-server) \ + $(use_enable cgi cgi-server) \ + $(use_enable curl curl-client) \ + $(use_enable cxx cplusplus) \ + $(use_enable libxml2 libxml2-backend) \ + $(use_enable threads abyss-threads) +} + +src_compile() { + default + + # Tools building is broken in this release + #use tools && emake -rC "${S}"/tools +} + +src_install() { + default + + # Tools building is broken in this release + #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install +} diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild deleted file mode 100644 index a224c3c1a99f..000000000000 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit 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 -# 2. SVN tagging of releases seems spotty: https://svn.code.sf.net/p/xmlrpc-c/code/release_number/ -# Because of this, we are following the "Super Stable" release channel - -DESCRIPTION="A lightweight RPC library based on XML and HTTP" -HOMEPAGE="https://xmlrpc-c.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" - -LICENSE="BSD" -SLOT="0/4.54" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -IUSE="abyss +cgi +curl +cxx +libxml2 threads test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( abyss curl cxx )" - -RDEPEND=" - dev-libs/openssl:= - sys-libs/ncurses:= - sys-libs/readline:= - curl? ( net-misc/curl ) - libxml2? ( dev-libs/libxml2 ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch - "${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch - "${FILESDIR}"/${PN}-1.54.06-wformat-security.patch -) - -pkg_setup() { - use curl || ewarn "Curl support disabled: No client library will be built" -} - -src_prepare() { - default - - sed -i \ - -e "/CFLAGS_COMMON/s|-g -O3$||" \ - -e "/CXXFLAGS_COMMON/s|-g$||" \ - common.mk || die -} - -src_configure() { - tc-export PKG_CONFIG - - econf \ - --disable-libwww-client \ - --disable-wininet-client \ - --without-libwww-ssl \ - $(use_enable abyss abyss-server) \ - $(use_enable cgi cgi-server) \ - $(use_enable curl curl-client) \ - $(use_enable cxx cplusplus) \ - $(use_enable libxml2 libxml2-backend) \ - $(use_enable threads abyss-threads) -} - -src_compile() { - default - - # Tools building is broken in this release - #use tools && emake -rC "${S}"/tools -} - -src_install() { - default - - # Tools building is broken in this release - #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install -} -- cgit v1.2.3-65-gdbad