From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A717A158090 for ; Thu, 12 May 2022 22:48:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1455E0864; Thu, 12 May 2022 22:48:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5DA1E0864 for ; Thu, 12 May 2022 22:48:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C16AE341722 for ; Thu, 12 May 2022 22:48:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49807439 for ; Thu, 12 May 2022 22:48:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1652395682.bc1f18f8e905115fb9a1dfba7bd7915de9677d96.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch X-VCS-Directories: sys-cluster/galera/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bc1f18f8e905115fb9a1dfba7bd7915de9677d96 X-VCS-Branch: master Date: Thu, 12 May 2022 22:48:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 92bc9501-fa19-4819-af0f-3e60fab3a3bc X-Archives-Hash: 529160692c142fc9668cb1c7ccee4ebd commit: bc1f18f8e905115fb9a1dfba7bd7915de9677d96 Author: Sam James gentoo org> AuthorDate: Thu May 12 22:47:58 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 12 22:48:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1f18f8 sys-cluster/galera: restore galera-4.1-strip-extra-cflags.patch Needed by galera-25.3.28-r2 still. Fixes: 390112c10222dcd5bdb5724c225ee99d11ffd7b0 Signed-off-by: Sam James gentoo.org> .../files/galera-4.1-strip-extra-cflags.patch | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch new file mode 100644 index 000000000000..dfa1642c7d7e --- /dev/null +++ b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch @@ -0,0 +1,78 @@ +diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript +--- a/galerautils/src/SConscript 2019-02-25 10:37:25.000000000 -0500 ++++ b/galerautils/src/SConscript 2019-03-07 09:51:27.163226469 -0500 +@@ -1,4 +1,4 @@ +-Import('env', 'x86', 'sysname', 'machine') ++Import('env', 'sysname', 'machine') + + libgalerautils_env = env.Clone() + +@@ -39,22 +39,6 @@ + crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ] + crc32c_objs = crc32c_env.SharedObject(crc32c_sources) + +-if x86: +- if machine != 'ppc64' and machine != 'ppc64le': +- crc32c_env.Append(CFLAGS = ' -msse4.2') +- if sysname == 'sunos': +- # Ideally we want to simply strip SSE4.2 flag from the resulting +- # crc32.pic.o +- # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html) +- # but that requires some serious scons-fu, so we just don't +- # compile hardware support in if host CPU does not have it. +- from subprocess import check_call +- try: +- check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True); +- except: +- libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE') +- crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE') +- + libgalerautils_env.StaticLibrary('galerautils', + libgalerautils_objs + crc32c_objs) + +diff -aurN a/SConstruct b/SConstruct +--- a/SConstruct 2019-03-07 09:44:38.588841625 -0500 ++++ b/SConstruct 2019-03-07 09:50:06.305952407 -0500 +@@ -67,7 +67,7 @@ + build_target = 'all' + + # Optimization level +-opt_flags = ' -g -O3 -DNDEBUG' ++opt_flags = ' -DNDEBUG' + + # Architecture (defaults to build host type) + compile_arch = '' +@@ -120,33 +120,6 @@ + if gcov: + opt_flags = opt_flags + ' --coverage -g' + +-if sysname == 'sunos': +- compile_arch = ' -mtune=native' +-elif x86: +- if bits == 32: +- if machine == 'x86_64': +- compile_arch = ' -mx32' +- else: +- compile_arch = ' -m32 -march=i686' +- if sysname == 'linux': +- link_arch = ' -Wl,-melf_i386' +- else: +- if machine == 'ppc64': +- compile_arch = ' -mtune=native' +- link_arch = ' -Wl,-melf64ppc' +- elif machine == 'ppc64le': +- compile_arch = ' -mtune=native' +- link_arch = ' -Wl,-melf64lppc' +- else: +- compile_arch = ' -m64' +- if sysname == 'linux': +- link_arch = ' -Wl,-melf_x86_64' +- link_arch = compile_arch + link_arch +-elif machine == 's390x': +- compile_arch = ' -mzarch' +- if bits == 32: +- compile_arch += ' -m32' +- + boost = int(ARGUMENTS.get('boost', 1)) + boost_pool = int(ARGUMENTS.get('boost_pool', 0)) + system_asio= int(ARGUMENTS.get('system_asio', 1))