commit: 722a58cbadfca20fc9ba71ce09008a9fd7584848 Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Sun Jun 25 08:17:57 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 26 14:41:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722a58cb
net-p2p/amule: fix build w/ clang and boost-1.82 Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> Closes: https://bugs.gentoo.org/907843 Closes: https://github.com/gentoo/gentoo/pull/31517 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{amule-9999.ebuild => amule-2.3.3-r1.ebuild} | 9 ++++++- net-p2p/amule/amule-9999.ebuild | 8 ++++++- .../amule/files/amule-2.3.3-autoconf-2.70.patch | 28 ++++++++++++++++++++++ net-p2p/amule/metadata.xml | 1 + 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-2.3.3-r1.ebuild similarity index 93% copy from net-p2p/amule/amule-9999.ebuild copy to net-p2p/amule/amule-2.3.3-r1.ebuild index 392ddb148410..e5e37d05e9dc 100644 --- a/net-p2p/amule/amule-9999.ebuild +++ b/net-p2p/amule/amule-2.3.3-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 WX_GTK_VER="3.0-gtk3" -inherit wxwidgets xdg-utils +inherit autotools flag-o-matic wxwidgets xdg-utils if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/amule-project/amule"; @@ -45,12 +45,14 @@ DEPEND="${RDEPEND} " BDEPEND=" virtual/pkgconfig + >=sys-devel/boost-m4-0.4_p20221019 nls? ( sys-devel/gettext ) " PATCHES=( "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" "${FILESDIR}/${PN}-2.3.3-fix-exception.patch" + "${FILESDIR}/${P}-autoconf-2.70.patch" ) pkg_setup() { @@ -59,13 +61,18 @@ pkg_setup() { src_prepare() { default + rm m4/boost.m4 || die if [[ ${PV} == 9999 ]]; then ./autogen.sh || die + else + eautoreconf fi } src_configure() { + append-cxxflags -std=gnu++14 + local myconf=( --with-denoise-level=0 --with-wx-config="${WX_CONFIG}" diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild index 392ddb148410..7decbd246b1d 100644 --- a/net-p2p/amule/amule-9999.ebuild +++ b/net-p2p/amule/amule-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 WX_GTK_VER="3.0-gtk3" -inherit wxwidgets xdg-utils +inherit flag-o-matic wxwidgets xdg-utils if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/amule-project/amule"; @@ -45,6 +45,7 @@ DEPEND="${RDEPEND} " BDEPEND=" virtual/pkgconfig + >=sys-devel/boost-m4-0.4_p20221019 nls? ( sys-devel/gettext ) " @@ -59,13 +60,18 @@ pkg_setup() { src_prepare() { default + rm m4/boost.m4 || die if [[ ${PV} == 9999 ]]; then ./autogen.sh || die + else + eautoreconf fi } src_configure() { + append-cxxflags -std=gnu++14 + local myconf=( --with-denoise-level=0 --with-wx-config="${WX_CONFIG}" diff --git a/net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch b/net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch new file mode 100644 index 000000000000..e52cfd6ae545 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch @@ -0,0 +1,28 @@ +From 0d3e85ea46b52685c5b198fbade3a82f38071ca4 Mon Sep 17 00:00:00 2001 +From: Pablo Barciela <s...@riseup.net> +Date: Sun, 19 Sep 2021 13:55:07 +0200 +Subject: [PATCH] allow to build with autoconf 2.70 and later + +Closes https://github.com/amule-project/amule/issues/232 +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 93a918c03..9c57668c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,10 +30,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) + + AC_PREREQ(2.62) + +-# autoconf 2.70 introduced some incompatibilities that will make the build fail +-# As a "workaround" reject 2.70 and above for now. +-m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.70]), [-1],, [m4_fatal([autoconf ]m4_defn([AC_AUTOCONF_VERSION])[ is known to not work with aMule. Please use 2.69 instead.])]) +- + AC_CONFIG_SRCDIR([src/amule.cpp]) + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) +-- +2.39.3 + diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml index 32fc55855071..8d9b90c9f6f6 100644 --- a/net-p2p/amule/metadata.xml +++ b/net-p2p/amule/metadata.xml @@ -11,6 +11,7 @@ </maintainer> <upstream> <remote-id type="github">amule-project/amule</remote-id> + <remote-id type="sourceforge">amule</remote-id> </upstream> <use> <flag name="daemon">Enable amule daemon</flag>
