sys-cluster/galera: respect AR

Closes: https://bugs.gentoo.org/721506
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch b/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch
new file mode 100644 (file)
index 0000000..972bb92
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch
@@ -0,0 +1,12 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -213,6 +213,9 @@ if cxx != 'default':
+ link = os.getenv('LINK', 'default')
+ if link != 'default':
+     env.Replace(LINK = link)
++ar = os.getenv('AR', 'default')
++if ar != 'default':
++    env.Replace(AR = ar)
+
+ # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc
+ cc_version = str(read_first_line(env['CC'].split() + ['--version']))

diff --git a/sys-cluster/galera/galera-26.4.4.ebuild b/sys-cluster/galera/galera-26.4.4.ebuild
index 769275ce3ad291d9aad809991dbca220a575d6a7..0a0b545084cb0c52f6d0e3d25c047dd6e946c18e 100644 (file)
--- a/sys-cluster/galera/galera-26.4.4.ebuild
+++ b/sys-cluster/galera/galera-26.4.4.ebuild
@@ -33,7 +33,10 @@ DEPEND="${BDEPEND}
 RDEPEND="${CDEPEND}"
 
 # Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
+PATCHES=(
+       "${FILESDIR}"/${PN}-4.1-strip-extra-cflags.patch
+       "${FILESDIR}"/${PN}-26.4.4-respect-AR.patch
+)
 
 src_prepare() {
        default
@@ -48,7 +51,7 @@ src_prepare() {
 }
 
 src_configure() {
-       tc-export CC CXX
+       tc-export AR CC CXX
        # Uses hardware specific code that seems to depend on SSE4.2
        if use cpu_flags_x86_sse4_2 ; then
                append-cflags -msse4.2