From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 21 Apr 2020 17:35:51 +0000 (-0400)
Subject: net-misc/bridge-utils: substitute AR from configure
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=98324336099cd804e6754bb2a8c3fd8c11e80840;p=gentoo.git

net-misc/bridge-utils: substitute AR from configure

Bug: https://bugs.gentoo.org/717700
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
index a371017e1588..11f95413077e 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 000000000000..0676d0cc9c7f
--- /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 <floppym@gentoo.org>
+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 <floppym@gentoo.org>
+---
+ 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
+