From 474b5e2f637e7c1a77fed68fd376bd643ffcd5ed Mon Sep 17 00:00:00 2001 From: Wade Cline Date: Sun, 31 May 2020 14:58:30 -0700 Subject: [PATCH] dev-libs/libmowgli: Fix 'ar' bug Bug: https://bugs.gentoo.org/723028 Signed-off-by: Wade Cline --- ...i-2.1.3-use-host-tools-for-ar-and-ranlib.patch | 15 +++++++++++++++ ...-2.1.3-r1.ebuild => libmowgli-2.1.3-r2.ebuild} | 9 ++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch rename dev-libs/libmowgli/{libmowgli-2.1.3-r1.ebuild => libmowgli-2.1.3-r2.ebuild} (81%) diff --git a/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch b/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch new file mode 100644 index 00000000000..e49e7c2c99b --- /dev/null +++ b/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index dfebb14..b3bd072 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -36,8 +36,8 @@ if test "$pgac_cv_var_PS_STRINGS" = yes ; then + AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS struct exists on your platform (likely no).]) + fi + +-AC_PATH_PROG(AR, ar) +-AC_PATH_PROG(RANLIB, ranlib) ++AC_CHECK_TOOL(AR, ar) ++AC_CHECK_TOOL(RANLIB, ranlib) + + LIBMOWGLI_MODULES="core base container dns eventloop ext linebuf module object platform thread vio" + AC_SUBST(LIBMOWGLI_MODULES) diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild similarity index 81% rename from dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild rename to dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild index 2597f8dcc4c..f3513020852 100644 --- a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild +++ b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit autotools + DESCRIPTION="Useful set of performance and usability-oriented extensions to C" HOMEPAGE="https://github.com/atheme/libmowgli-2" SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -20,10 +22,15 @@ RDEPEND="ssl? ( DEPEND="${RDEPEND}" DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt ) -PATCHES=( "${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch ) +PATCHES=( + "${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch + "${FILESDIR}"/${P}-use-host-tools-for-ar-and-ranlib.patch +) + S="${WORKDIR}/${PN}-2-${PV}" src_configure() { + eautoreconf econf \ $(use_with ssl openssl) } -- 2.26.2