From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- sys-cluster/galera/Manifest | 3 +- .../files/galera-26.4.5-respect-toolchain.patch | 55 ++++++++++++++++++++++ sys-cluster/galera/galera-26.4.5.ebuild | 4 +- 3 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 sys-cluster/galera/files/galera-26.4.5-respect-toolchain.patch (limited to 'sys-cluster/galera') diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index 07b0d9d20b59..5884fbc847fa 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -1,4 +1,5 @@ AUX galera-26.4.4-respect-AR.patch 396 BLAKE2B 17c0b47ce5d1a8326b9f11311647e77d12ae55570d30847d5f9bc3eaee0cc80b482375da0b4d4d398539e9763ba981b0135292c67a356df32a2f6453be71d7e3 SHA512 fa1014c1574e489e4903dbe583a4e981853d612ca2fffbe88010826a40f889a2bb20995699a520efe9bdb52595bb6afff115321505438387d564dd25f93dd140 +AUX galera-26.4.5-respect-toolchain.patch 1867 BLAKE2B ba2bf780717bfc9b778645366d933c234aad279985f8ddfe68c4d6d01b71baf7961bae0dc67c980d8b0271c63b567509a2dafb241aaf67e2cb06b018bda54d40 SHA512 34d23d1e9c0906e0b7bff357e76e547d1bd4e1d555a68ef64b8389ddc64af817832bcd4e04958b25d60ef9700dbe2df69a2e2acc5060d701496629b848bc7f7b AUX galera-26.4.5-strip-extra-cflags.patch 2235 BLAKE2B 95c0a28a34382e4ba9690fd2c1556574ebc7a4da93fa43f21cd1dddf99ceac357922ba325dbf8f5d110ea6fdea63fe3e7fecb10c2fdc83857b70410409437aa2 SHA512 ca979602feb222ab052971ab08bfee10efc7980f2c509d4bcf1476d052ad3793aab91c4daecb1c029408becac62607b04c91cfe81f0a9f8cf42b3ef0d0cc8d89 AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42c4b19e65e1084e471d4c7613a661206ee05fa280c29266be4ae66c0b1001de3062a6396c3b45917fcf3d4090b8afe229a7e680 SHA512 4f41398faaa138543ff6fd24b2aac9aa329dabf74d6355ea5c620db64e3112e27e17c15bf7e1dae1e7ddbe92795cedd65a9d6e52bd07b66f3fe27dde2ffc7cad AUX galera-4.1-strip-extra-cflags.patch 2747 BLAKE2B 314e020bdbce2d3080d28c4d5bf5ad438affc8075736c38b77d713e59749a4eabce3a38b6c918b1768f48b99ec5c860813c3441291d0834ebf6d6ed545d30576 SHA512 0458705897861d4bc225326077ae379fb1c921aa65a102a24f2fba5c866c52a549c47bed929801c06ebb0c484136c1179a56b2fd750abd6aabc7a6a74fc18c2f @@ -19,5 +20,5 @@ EBUILD galera-25.3.28.ebuild 1933 BLAKE2B 30d6355db4bc5eecec418c814cb6de00d4013e EBUILD galera-26.4.2.ebuild 1887 BLAKE2B 3cfcc688d2211a780d74e8c1001abb560c4990328f281bf4754c4d0a47b0c1f54a3cd83817e66086e330050f8cee45ca5a55b4034cbd6f9c7c2b2e74b98f9a2a SHA512 4ebd12af503f8c62b354a1fc2f19190f61a1708d1c7f391320fc7df013a1409790af14c4722b7ae739094c7552f7c9c3825153fdc06f0190627616b17b18d23d EBUILD galera-26.4.3.ebuild 1789 BLAKE2B 457e551c47e4711a1c4420aa667a4d949b386bac6942b9c20dfbc577d6158db07b103e542daaff2e71c3233d61a99921ab20d5bf901e7b10a543aeb880af1495 SHA512 78e370cee168728221740f984907f987c5c5f84a889e5ea62406bee503b8bd5638c2d3d1057dbd220f2a195f971fe91696e6f6e72d0f709df1fca3c5567e9660 EBUILD galera-26.4.4.ebuild 1837 BLAKE2B a948407a0e4e8fd766b73232cde385bbadb6567cda4065e19ffee6f147d55d24717294db48b22c2363fdd1e293d1e5a8a42039907d7e964ef6af5baf523a769d SHA512 90b4c2fab65528b1495744d0c4ac893898fec8b1f26c18791aead216550312a8214af9c619604ff837f58a7488290d7f89fd7a83d089525d1efbf2d98c60302a -EBUILD galera-26.4.5.ebuild 1871 BLAKE2B 410ef46684d0fe62d8136d2db098b11aec0a29c177ed8e84910ef44ab1381788d61a58e73f81b2116080f966c761d71393ee59b36cb026523e0db134d3b9185c SHA512 37215c9c7a2801cc0c0348a4c8997a7d4427a62eb58d6c806ef053aaca1d95a9d42460be7852db530f407498c771c85d2582ffcb539ad8b56439da4406b87a79 +EBUILD galera-26.4.5.ebuild 1886 BLAKE2B 4a98c96e37676c0348581a6090338ec97b90915f4599aa3d001d2f866a26450dec5543ce82b818d144d3697ca4ba88f773fa7f9df8d7054310760a2bd5f5a674 SHA512 2b55cb4aa102aa713eb23ee2348b0fc92d82028d30920b6765155e6ff613ef8664e0f72d8c1e830bfd1cb5609c614ad6eaa9a50ec0a5748f101d5a0865408d0e MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2 diff --git a/sys-cluster/galera/files/galera-26.4.5-respect-toolchain.patch b/sys-cluster/galera/files/galera-26.4.5-respect-toolchain.patch new file mode 100644 index 000000000000..c82c870b4f39 --- /dev/null +++ b/sys-cluster/galera/files/galera-26.4.5-respect-toolchain.patch @@ -0,0 +1,55 @@ +--- a/SConscript ++++ b/SConscript +@@ -33,15 +33,17 @@ if has_version_script: + def check_dynamic_symbols(target, source, env): + import subprocess + ++ objdump = env['OBJDUMP'] ++ + # Check if objdump exists +- p = subprocess.Popen(['objdump', '--version'], stdout=subprocess.PIPE) ++ p = subprocess.Popen([objdump, '--version'], stdout=subprocess.PIPE) + p.wait() + if p.returncode != 0: + print('objdump utility is not found. Skipping checks...') + return 0 + + # Check that DSO doesn't contain asio-related dynamic symbols +- if env.Execute(Action(['! objdump -T ' + target[0].abspath + ' | grep asio'], None)): ++ if env.Execute(Action(['! ' + objdump + ' -T ' + target[0].abspath + ' | grep asio'], None)): + return 1 + return 0 + +--- a/SConstruct ++++ b/SConstruct +@@ -5,6 +5,7 @@ + # SCons build script to build galera libraries + # + # How to control the build with environment variables: ++# Set AR to specify archive utility + # Set CC to specify C compiler + # Set CXX to specify C++ compiler + # Set CPPFLAGS to add non-standard include paths and preprocessor macros +@@ -13,6 +14,7 @@ + # Set CXXFLAGS to supply C++ compiler options + # Set LDFLAGS to *override* linking flags + # Set LIBPATH to add non-standard linker paths ++# Set OBJDUMP to specify objdump utility + # Set RPATH to add rpaths + # + # Some useful CPPFLAGS: +@@ -205,6 +207,13 @@ 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) ++objdump = os.getenv('OBJDUMP', 'default') ++if objdump != 'default': ++ env.Replace(OBJDUMP = objdump) ++ + + # 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.5.ebuild b/sys-cluster/galera/galera-26.4.5.ebuild index 760070fc8afc..9cdd6baf8cd7 100644 --- a/sys-cluster/galera/galera-26.4.5.ebuild +++ b/sys-cluster/galera/galera-26.4.5.ebuild @@ -37,7 +37,7 @@ RDEPEND="${CDEPEND}" # Respect {C,LD}FLAGS. PATCHES=( "${FILESDIR}"/${PN}-26.4.5-strip-extra-cflags.patch - "${FILESDIR}"/${PN}-26.4.4-respect-AR.patch + "${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch ) S="${WORKDIR}/${MY_P}" @@ -55,7 +55,7 @@ src_prepare() { } src_configure() { - tc-export AR CC CXX + tc-export AR CC CXX OBJDUMP # Uses hardware specific code that seems to depend on SSE4.2 if use cpu_flags_x86_sse4_2 ; then append-cflags -msse4.2 -- cgit v1.2.3