commit: 98324336099cd804e6754bb2a8c3fd8c11e80840 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Apr 21 17:35:51 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Apr 21 17:35:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98324336
net-misc/bridge-utils: substitute AR from configure Bug: https://bugs.gentoo.org/717700 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/bridge-utils/bridge-utils-1.6.ebuild | 7 ++-- ...dge-substitute-AR-variable-from-configure.patch | 40 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild index a371017e158..11f95413077 100644 --- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild @@ -29,6 +29,9 @@ get_headers() { } src_prepare() { + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + ) default eautoreconf } @@ -44,10 +47,6 @@ src_configure() { econf "${myeconfargs[@]}" } -src_compile() { - emake AR=$(tc-getAR) -} - src_install() { emake install DESTDIR="${D}" dodoc AUTHORS ChangeLog README THANKS TODO \ diff --git a/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch b/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch new file mode 100644 index 00000000000..0676d0cc9c7 --- /dev/null +++ b/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch @@ -0,0 +1,40 @@ +From 4dc12feb7b5a0f8f4d27c737513853896e77feea Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Tue, 21 Apr 2020 13:17:33 -0400 +Subject: [PATCH] libbridge: substitute AR variable from configure + +Bug: https://bugs.gentoo.org/717700 +Signed-off-by: Mike Gilbert <[email protected]> +--- + configure.ac | 1 + + libbridge/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8b2e2ea..e66f334 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,6 +12,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AC_CHECK_TOOL([AR], [ar]) + + dnl Checks for header files. + AC_HEADER_STDC +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in +index 7932bfe..bd55e9b 100644 +--- a/libbridge/Makefile.in ++++ b/libbridge/Makefile.in +@@ -1,7 +1,7 @@ + + KERNEL_HEADERS=-I@KERNEL_HEADERS@ + +-AR=ar ++AR=@AR@ + RANLIB=@RANLIB@ + + CC=@CC@ +-- +2.26.1 +
