| 1 |
commit: 1ade2f6b70dfbbb2435a2dd3d25ec2f82e597d9e |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 23 21:42:54 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 23 21:45:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ade2f6b |
| 7 |
|
| 8 |
sys-cluster/galera: respect AR |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/721506 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-cluster/galera/files/galera-26.4.4-respect-AR.patch | 12 ++++++++++++ |
| 15 |
sys-cluster/galera/galera-26.4.4.ebuild | 7 +++++-- |
| 16 |
2 files changed, 17 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..972bb9288a6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch |
| 23 |
@@ -0,0 +1,12 @@ |
| 24 |
+--- a/SConstruct |
| 25 |
++++ b/SConstruct |
| 26 |
+@@ -213,6 +213,9 @@ if cxx != 'default': |
| 27 |
+ link = os.getenv('LINK', 'default') |
| 28 |
+ if link != 'default': |
| 29 |
+ env.Replace(LINK = link) |
| 30 |
++ar = os.getenv('AR', 'default') |
| 31 |
++if ar != 'default': |
| 32 |
++ env.Replace(AR = ar) |
| 33 |
+ |
| 34 |
+ # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc |
| 35 |
+ cc_version = str(read_first_line(env['CC'].split() + ['--version'])) |
| 36 |
|
| 37 |
diff --git a/sys-cluster/galera/galera-26.4.4.ebuild b/sys-cluster/galera/galera-26.4.4.ebuild |
| 38 |
index 769275ce3ad..0a0b545084c 100644 |
| 39 |
--- a/sys-cluster/galera/galera-26.4.4.ebuild |
| 40 |
+++ b/sys-cluster/galera/galera-26.4.4.ebuild |
| 41 |
@@ -33,7 +33,10 @@ DEPEND="${BDEPEND} |
| 42 |
RDEPEND="${CDEPEND}" |
| 43 |
|
| 44 |
# Respect {C,LD}FLAGS. |
| 45 |
-PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" ) |
| 46 |
+PATCHES=( |
| 47 |
+ "${FILESDIR}"/${PN}-4.1-strip-extra-cflags.patch |
| 48 |
+ "${FILESDIR}"/${PN}-26.4.4-respect-AR.patch |
| 49 |
+) |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
default |
| 53 |
@@ -48,7 +51,7 @@ src_prepare() { |
| 54 |
} |
| 55 |
|
| 56 |
src_configure() { |
| 57 |
- tc-export CC CXX |
| 58 |
+ tc-export AR CC CXX |
| 59 |
# Uses hardware specific code that seems to depend on SSE4.2 |
| 60 |
if use cpu_flags_x86_sse4_2 ; then |
| 61 |
append-cflags -msse4.2 |
Archives