[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
commit: 35db2fa9ded7b0dd5d6e0d9c29eebba2848a9788
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Apr 23 10:01:32 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Apr 23 10:41:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35db2fa9
sys-cluster/galera: drop 26.4.13-r1, 26.4.14, 26.4.15
Closes: https://bugs.gentoo.org/640618
Closes: https://bugs.gentoo.org/775236
Closes: https://bugs.gentoo.org/806348
Closes: https://bugs.gentoo.org/922984
Signed-off-by: Petr Vaněk gentoo.org>
sys-cluster/galera/Manifest| 3 -
sys-cluster/galera/files/galera-26.4.13-asio.patch | 22 --
.../galera/files/galera-26.4.13-tests.patch| 13
.../files/galera-26.4.6-strip-extra-cflags.patch | 38 --
.../files/galera-26.4.8-respect-toolchain.patch| 53 --
sys-cluster/galera/galera-26.4.13-r1.ebuild| 85 --
sys-cluster/galera/galera-26.4.14.ebuild | 85 --
sys-cluster/galera/galera-26.4.15.ebuild | 71 --
8 files changed, 370 deletions(-)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 75b9771b65cc..608a476d4f6b 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,5 +1,2 @@
-DIST galera-26.4.13.tar.gz 1529682 BLAKE2B
d7030fd5e3a48ede16f608cca9986de117a54f99cf3d972a5b14623acd84f05f31f5cdbbc3032bf5caa8e0486f418ac07c8f87287bb14a8164507c558876ae61
SHA512
e548048eac5fceb0bea1ae736abc6c488d175bc71a3cfb963675232688392ecb5dcc64ddd8e78ceda40e26b94b806d3c34bd9fc9765ebc047b5a5ce28ff7efea
-DIST galera-26.4.14.tar.gz 1532285 BLAKE2B
c647332a1a70609fbe3197653df2e24ccd0c5e053b1c9ef4d3de20bc70d8f2363090c6296e9e81eeb92a625c85d67b4f298db8e34862c7deb907baf13bae2e45
SHA512
f9bb3d1d503ed7f90cfc5596e68e8cf77683d2d7e6ddb45d0a6618bbc6a31ad2caa80933f6724734ec4ae416b37d7d7ec61e1bf0b87cefd4c959954266a2fb26
-DIST galera-26.4.15.tar.gz 1532571 BLAKE2B
8aa5c6027b4cfe7f41c9d431315a4a12b9ea45896743bafa296470e8e3f0613e8974e3daea0d7c89c3e2d014692fb7d10f4a64588add569a197546dcd0f0108d
SHA512
b866610c00df344ea8c9cc948fadfa4be808ee6bb100fec470dee006458d81ec704db156d320889610bff9b944023963f624b8672596a282c7658c55d99ffca6
DIST galera-26.4.17.tar.gz 1541975 BLAKE2B
7b12a9c056e45fc0614910a5f6eb1127e3613aa7b212db94594330ddd048de4982cbb1d36a75c08da0aa31a9a08a5632686e867b967291bb269835e37a6efcb3
SHA512
c11fecb6c9e142643f594275d6ff486d7a3615016691373831e57221f9bbfdc086202757068a2cc9308049b3499aa64dcc6f066dcf6437d25a4c546b19ac8fa3
DIST galera-26.4.18.tar.gz 1542330 BLAKE2B
5a0d8b1929a72ce36f521ba3404b9251503226ba041970bc67f9d25b2b55c2daa2128500117366273541578eb1d7fd213d5f8336cba705650c55b70125dcbf0d
SHA512
75ae75c0bac1b2ba5d0230af9b0e14b5e8661f20f84cee3800b2e979c3ef53c9dd5ce8cebcec1ae9205b5dec28f94f690854cce32a10e9f58d8aa55725fd59c6
diff --git a/sys-cluster/galera/files/galera-26.4.13-asio.patch
b/sys-cluster/galera/files/galera-26.4.13-asio.patch
deleted file mode 100644
index 5f20ec1624e2..
--- a/sys-cluster/galera/files/galera-26.4.13-asio.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index ce955fc..3ff241a 100644
a/SConstruct
-+++ b/SConstruct
-@@ -325,7 +325,7 @@ def CheckSystemASIOVersion(context):
- #pragma message "Asio version:" XSTR(ASIO_VERSION)
- #if ASIO_VERSION < 101008
- #error Included asio version is too old
--#elif ASIO_VERSION >= 101100
-+#elif ASIO_VERSION >= 102600
- #error Included asio version is too new
- #endif
-
-@@ -335,7 +335,7 @@ int main()
- }
-
- """
--context.Message('Checking ASIO version (>= 1.10.8 and < 1.11.0) ... ')
-+context.Message('Checking ASIO version (>= 1.10.8 and < 1.26.0) ... ')
- result = context.TryLink(system_asio_test_source_file, '.cpp')
- context.Result(result)
- return result
diff --git a/sys-cluster/galera/files/galera-26.4.13-tests.patch
b/sys-cluster/galera/files/galera-26.4.13-tests.patch
deleted file mode 100644
index 21b1b72f0058..
--- a/sys-cluster/galera/files/galera-26.4.13-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wsrep/tests/wsrep_loader_test.c b/wsrep/tests/wsrep_loader_test.c
-index 47f4db2..8e349c8 100644
a/wsrep/tests/wsrep_loader_test.c
-+++ b/wsrep/tests/wsrep_loader_test.c
-@@ -48,7 +48,7 @@ int wsrep_load_unload()
- {
- fprintf(stderr, "Provider version string '%s' not expected '%s'\n",
- wsrep->provider_version, expected_version);
--abort();
-+//abort();
- }
- wsrep_unload(wsrep);
- return 0;
diff --git a/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch
b/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch
deleted file mode 100644
index 5f5be7a7a94b..
--- a/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
a/SConstruct
-+++ b/SConstruct
-@@ -89,7 +89,7 @@ Commandline Options:
-
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
commit: be8b15c8c702ead3d3841afdff07c7774b9471f7
Author: David Seifert gentoo org>
AuthorDate: Mon Jan 2 22:26:03 2023 +
Commit: David Seifert gentoo org>
CommitDate: Mon Jan 2 22:26:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8b15c8
sys-cluster/galera: partially restore old versions
Signed-off-by: David Seifert gentoo.org>
sys-cluster/galera/Manifest| 2 +
.../files/galera-25.3.32-respect-cflags.patch | 38 ++
sys-cluster/galera/galera-25.3.35.ebuild | 80 ++
sys-cluster/galera/galera-25.3.37.ebuild | 80 ++
4 files changed, 200 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 25285a706ebd..be25eb1b6ae1 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,2 +1,4 @@
+DIST galera-25.3.35.tar.gz 1278869 BLAKE2B
c5c0cc1d4ad29caf94550a6b96ab9762a97273713b906c4f3e3d9851b90b1028246285e74becc912336edbb6e1a427d9bdd9c31177f3dd899153dbed54cdde92
SHA512
aaa7038cf9e8be57ae1760d259af31bafa8d3c994c46cbb6224231fe3bb63d7bc830a97a2d4833cd24b85a47da2e4c7bfc2a99d73155d6bd6330e4a9dda3083d
+DIST galera-25.3.37.tar.gz 1282455 BLAKE2B
1bdaad50cc08839bfaf988f2b4c5da606f08cb3d4ca43ddb27755a312f490e2e45231446c4d72c6da49aaa7ff309da661a92877a80a983c0e1f0d103f5201ee6
SHA512
348fbc100caa267ea93d2e66ed7bfe437c14ec823d31ae1f293b46791e0063f7afb41fd307ff49fa72e6c5880887da755e3782c50bdbc28622ab00020f1feaec
DIST galera-26.4.10.tar.gz 1424663 BLAKE2B
6be96cfaffd0af14a511f1f1aeaf2b7c18a3aa05216389e51a90834d9307bcd832005ee5da38acf530d40b2b6c11e62353be5aa4c0f678804808d1f74bbeea38
SHA512
97fd629d9f963459a9bce377ebcd35a5b4f533451f38011a03e440f0ac3ceddcaf45f4001afa8cd523626c03e64f27363e4b2e819d2b637551e579a3add44226
DIST galera-26.4.13.tar.gz 1529682 BLAKE2B
d7030fd5e3a48ede16f608cca9986de117a54f99cf3d972a5b14623acd84f05f31f5cdbbc3032bf5caa8e0486f418ac07c8f87287bb14a8164507c558876ae61
SHA512
e548048eac5fceb0bea1ae736abc6c488d175bc71a3cfb963675232688392ecb5dcc64ddd8e78ceda40e26b94b806d3c34bd9fc9765ebc047b5a5ce28ff7efea
diff --git a/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
b/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
new file mode 100644
index ..94c1f829450a
--- /dev/null
+++ b/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
@@ -0,0 +1,38 @@
+--- a/SConstruct
b/SConstruct
+@@ -88,7 +88,7 @@ Commandline Options:
+ build_target = 'all'
+
+ # Optimization level
+-opt_flags= ' -g -O3 -DNDEBUG'
++opt_flags= ' -DNDEBUG'
+
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -121,26 +121,6 @@ elif debug_lvl == 3:
+ if dbug:
+ opt_flags = opt_flags + ' -DGU_DBUG_ON'
+
+-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:
+-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))
diff --git a/sys-cluster/galera/galera-25.3.35.ebuild
b/sys-cluster/galera/galera-25.3.35.ebuild
new file mode 100644
index ..038ddd3e62c9
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.35.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+MY_PN="${PN}-3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the
wsrep API"
+HOMEPAGE="https://galeracluster.com;
+SRC_URI="https://releases.galeracluster.com/${MY_PN}/source/${MY_P}.tar.gz ->
${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/openssl:0=
+ dev-libs/boost:=
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/check
+ >=dev-cpp/asio-1.10.1[ssl(+)]
+ https://galeracluster.com;
+SRC_URI="https://releases.galeracluster.com/${MY_PN}/source/${MY_P}.tar.gz ->
${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/openssl:0=
+ >=dev-libs/boost-1.41:0=
+"
+
+DEPEND="
+
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
commit: 64f5b910ce6fefed1987112a6bbf1d893bedc26b
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 8 19:13:58 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 8 19:16:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f5b910
sys-cluster/galera: bump to v26.4.8
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-cluster/galera/Manifest| 1 +
.../files/galera-26.4.8-respect-toolchain.patch| 53 ++
sys-cluster/galera/galera-26.4.8.ebuild| 85 ++
3 files changed, 139 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index b520f03e823..70f4a1ab797 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,4 +1,5 @@
DIST galera-25.3.28.tar.gz 3390722 BLAKE2B
4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611
SHA512
8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
DIST galera-25.3.32.tar.gz 1277302 BLAKE2B
061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2
SHA512
e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53
DIST galera-26.4.7.tar.gz 1339462 BLAKE2B
9d8ef6ba9e153de848005195edbd99234f282c4e7bda4ddf42f3d6c99088fc3e57536863eb244bfb90d37dbdb6d0cc71661ee5297e59f2faf666da84ee731975
SHA512
ae9c898756ed6cd180bb7bc6a25e7e6b533e4a15a88d3820a936ca203cb0215aca5840599214d2236013da6759981471b47e0e0759d1ccd24c05b8e3c59f3a8c
+DIST galera-26.4.8.tar.gz 1423256 BLAKE2B
9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4
SHA512
5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661
DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B
fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6
SHA512
25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
diff --git a/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch
b/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch
new file mode 100644
index 000..202f5aaefc0
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch
@@ -0,0 +1,53 @@
+--- a/SConscript
b/SConscript
+@@ -47,13 +47,15 @@ def check_executable_exists(command):
+ return retval
+
+ def check_dynamic_symbols(target, source, env):
++objdump = env['OBJDUMP']
++
+ # Check if objdump exists
+-if check_executable_exists(['objdump', '--version']):
++if check_executable_exists([objdump, '--version']):
+ print('Skipping dynamic symbols check.')
+ 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 RPATHto add rpaths
+ #
+ # Some useful CPPFLAGS:
+@@ -183,6 +185,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.8.ebuild
b/sys-cluster/galera/galera-26.4.8.ebuild
new file mode 100644
index 000..0c3dafe0453
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.8.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-any-r1 scons-utils
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
commit: 70f12d124a6dfd2a46b849d3fd5f044272f61ff7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Jan 22 02:12:31 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Jan 22 02:19:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f12d12
sys-cluster/galera: bump to v25.3.32
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-cluster/galera/Manifest| 1 +
.../files/galera-25.3.32-respect-cflags.patch | 38 ++
sys-cluster/galera/galera-25.3.32.ebuild | 82 ++
3 files changed, 121 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index c91018f5e80..137a3ddc15f 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,2 +1,3 @@
DIST galera-25.3.28.tar.gz 3390722 BLAKE2B
4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611
SHA512
8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
+DIST galera-25.3.32.tar.gz 1277302 BLAKE2B
061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2
SHA512
e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53
DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B
fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6
SHA512
25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
diff --git a/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
b/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
new file mode 100644
index 000..94c1f829450
--- /dev/null
+++ b/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
@@ -0,0 +1,38 @@
+--- a/SConstruct
b/SConstruct
+@@ -88,7 +88,7 @@ Commandline Options:
+ build_target = 'all'
+
+ # Optimization level
+-opt_flags= ' -g -O3 -DNDEBUG'
++opt_flags= ' -DNDEBUG'
+
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -121,26 +121,6 @@ elif debug_lvl == 3:
+ if dbug:
+ opt_flags = opt_flags + ' -DGU_DBUG_ON'
+
+-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:
+-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))
diff --git a/sys-cluster/galera/galera-25.3.32.ebuild
b/sys-cluster/galera/galera-25.3.32.ebuild
new file mode 100644
index 000..ef8bd5a746c
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.32.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the
wsrep API"
+HOMEPAGE="https://galeracluster.com;
+SRC_URI="https://releases.galeracluster.com/galera-3/source/galera-3-${PV}.tar.gz
-> ${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+ dev-libs/openssl:0=
+ >=dev-libs/boost-1.41:0=
+ "
+
+BDEPEND=">=sys-devel/gcc-4.4"
+
+DEPEND="${BDEPEND}
+ ${CDEPEND}
+ dev-libs/check
+ >=dev-cpp/asio-1.10.1[ssl]
+
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
commit: e4ff5ba360d02ceacebfefc9b509aaf7fce715f0
Author: Michał Górny gentoo org>
AuthorDate: Fri Jan 1 01:58:39 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Jan 1 01:58:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ff5ba3
sys-cluster/galera: Remove old (py3.6)
Signed-off-by: Michał Górny gentoo.org>
sys-cluster/galera/Manifest| 2 -
.../files/galera-3.15-strip-extra-cflags.patch | 70 -
sys-cluster/galera/galera-25.3.25.ebuild | 90 --
sys-cluster/galera/galera-25.3.26.ebuild | 90 --
sys-cluster/galera/galera-25.3.28.ebuild | 90 --
5 files changed, 342 deletions(-)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 8bc9a834075..3de72656162 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,8 +1,6 @@
-DIST galera-25.3.26.tar.gz 3386588 BLAKE2B
ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4
SHA512
c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
DIST galera-25.3.28.tar.gz 3390722 BLAKE2B
4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611
SHA512
8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
DIST galera-26.4.2.tar.gz 3499538 BLAKE2B
4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115
SHA512
6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
DIST galera-26.4.3.tar.gz 3507925 BLAKE2B
fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976
SHA512
857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
DIST galera-26.4.4.tar.gz 3472392 BLAKE2B
146355ad95058d08800870be1c7d1d0be84d2cc621cc7857754468256cfa7ff5c99b98dfab71ea8354f6fdd720ac3a0849f768cf9cc75a55a92e8cdc0a19a9d4
SHA512
4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f
-DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B
892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216
SHA512
bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
DIST galera-4-26.4.5.tar.gz 3527293 BLAKE2B
2e46a1a76ea512cd644f9df6db380fcf232ef296b4178cb85782ece7e6ec70d281e89aea495167028c6e19d70455aecd272e18d8187123093e438715743a2ba6
SHA512
a8400a2a2d9b378e1e5ab9311b2d174355f9126b3bb81863de57db698bcea7571330e255b0f6d139abc4378c80db898739c856b639142864ce34cd147f255b0f
DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B
fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6
SHA512
25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
diff --git a/sys-cluster/galera/files/galera-3.15-strip-extra-cflags.patch
b/sys-cluster/galera/files/galera-3.15-strip-extra-cflags.patch
deleted file mode 100644
index b47ec39bf5a..000
--- a/sys-cluster/galera/files/galera-3.15-strip-extra-cflags.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
a/galerautils/src/SConscript 2015-03-16 07:18:42.0 -0400
-+++ b/galerautils/src/SConscript 2015-04-07 15:03:21.661301200 -0400
-@@ -1,4 +1,4 @@
--Import('env', 'x86', 'sysname')
-+Import('env', 'sysname')
-
- libgalerautils_env = env.Clone()
-
-@@ -39,21 +39,6 @@
- crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
- crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
-
--if x86:
--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')
--
-
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
commit: 4aeef4f98566a48565c0d42cc0473322b7b7fff0
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jun 25 21:23:55 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jun 25 21:43:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aeef4f9
sys-cluster/galera: bump to v26.4.5
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-cluster/galera/Manifest| 1 +
.../files/galera-26.4.5-strip-extra-cflags.patch | 68 +
sys-cluster/galera/galera-26.4.5.ebuild| 88 ++
3 files changed, 157 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 96de2b635ea..c2349925463 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -4,3 +4,4 @@ DIST galera-26.4.2.tar.gz 3499538 BLAKE2B
4531b246da119528192ce85364a344f56aeb83
DIST galera-26.4.3.tar.gz 3507925 BLAKE2B
fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976
SHA512
857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
DIST galera-26.4.4.tar.gz 3472392 BLAKE2B
146355ad95058d08800870be1c7d1d0be84d2cc621cc7857754468256cfa7ff5c99b98dfab71ea8354f6fdd720ac3a0849f768cf9cc75a55a92e8cdc0a19a9d4
SHA512
4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f
DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B
892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216
SHA512
bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
+DIST galera-4-26.4.5.tar.gz 3527293 BLAKE2B
2e46a1a76ea512cd644f9df6db380fcf232ef296b4178cb85782ece7e6ec70d281e89aea495167028c6e19d70455aecd272e18d8187123093e438715743a2ba6
SHA512
a8400a2a2d9b378e1e5ab9311b2d174355f9126b3bb81863de57db698bcea7571330e255b0f6d139abc4378c80db898739c856b639142864ce34cd147f255b0f
diff --git a/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
b/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
new file mode 100644
index 000..ac99140b6c9
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
@@ -0,0 +1,68 @@
+--- a/SConstruct
b/SConstruct
+@@ -87,7 +87,7 @@ Commandline Options:
+ build_target = 'all'
+
+ # Optimization level
+-opt_flags= ' -g -O3 -DNDEBUG'
++opt_flags= ' -DNDEBUG'
+
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -133,26 +133,6 @@ if dbug:
+ 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:
+-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))
+--- a/galerautils/src/SConscript
b/galerautils/src/SConscript
+@@ -1,4 +1,4 @@
+-Import('env', 'x86', 'sysname')
++Import('env', 'sysname')
+
+ libgalerautils_env = env.Clone()
+
+@@ -39,21 +39,6 @@ crc32c_env.Append(CPPFLAGS = ' -DWITH_GALERA')
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
+
+-if x86:
+-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 --git a/sys-cluster/galera/galera-26.4.5.ebuild
b/sys-cluster/galera/galera-26.4.5.ebuild
new file mode 100644
index 000..760070fc8af
--- /dev/null
+++
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
commit: 1ade2f6b70dfbbb2435a2dd3d25ec2f82e597d9e
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat May 23 21:42:54 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat May 23 21:45:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ade2f6b
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 gentoo.org>
sys-cluster/galera/files/galera-26.4.4-respect-AR.patch | 12
sys-cluster/galera/galera-26.4.4.ebuild | 7 +--
2 files changed, 17 insertions(+), 2 deletions(-)
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
index 000..972bb9288a6
--- /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 769275ce3ad..0a0b545084c 100644
--- 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
commit: 766bfd2d48a369055c57670543781609e48faeb6
Author: Brian Evans gentoo org>
AuthorDate: Tue Nov 12 02:13:28 2019 +
Commit: Brian Evans gentoo org>
CommitDate: Tue Nov 12 02:13:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766bfd2d
sys-cluster/galera: Version bump for 26.4.3
Include new garbd script
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans gentoo.org>
sys-cluster/galera/Manifest | 1 +
sys-cluster/galera/files/garb.init | 35 +++
sys-cluster/galera/galera-26.4.3.ebuild | 80 +
3 files changed, 116 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 3b62210d7fc..0e33ea8055b 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,4 +1,5 @@
DIST galera-25.3.26.tar.gz 3386588 BLAKE2B
ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4
SHA512
c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
DIST galera-25.3.28.tar.gz 3390722 BLAKE2B
4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611
SHA512
8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
DIST galera-26.4.2.tar.gz 3499538 BLAKE2B
4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115
SHA512
6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
+DIST galera-26.4.3.tar.gz 3507925 BLAKE2B
fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976
SHA512
857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B
892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216
SHA512
bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
diff --git a/sys-cluster/galera/files/garb.init
b/sys-cluster/galera/files/garb.init
new file mode 100644
index 000..5bf57a7a683
--- /dev/null
+++ b/sys-cluster/galera/files/garb.init
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/garbd"
+pidfile="${PIDFILE:-/var/run/garbd}"
+command_background="yes"
+command_args=""
+command_user="nobody"
+
+depend() {
+ use net
+ after mysql
+}
+
+start_pre() {
+ if [ -z "${GALERA_NODES}" ]; then
+ eerror "List of GALERA_NODES is not configured"
+ return 1
+ fi
+
+ if [ -z "${GALERA_GROUP}" ]; then
+ eerror "GALERA_GROUP name is not configured"
+ return 1
+ fi
+
+ GALERA_PORT=${GALERA_PORT:-4567}
+
+ local OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}"
+ [ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
+ [ -n "${LOG_FILE}" ] && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
+ [ -n "${NODE_NAME}" ] && OPTIONS="${OPTIONS} -n ${NODE_NAME}"
+
+ command_args="${OPTIONS}"
+}
diff --git a/sys-cluster/galera/galera-26.4.3.ebuild
b/sys-cluster/galera/galera-26.4.3.ebuild
new file mode 100644
index 000..0e03a25d79f
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the
wsrep API"
+HOMEPAGE="http://galeracluster.com;
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.10/${P}/src/${P}.tar.gz;
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+
+CDEPEND="
+ dev-libs/openssl:0=
+ >=dev-libs/boost-1.41:0=
+ "
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
+ ${CDEPEND}
+ dev-libs/check
+ >=dev-cpp/asio-1.10.1[ssl]
+
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/, sys-cluster/galera/
commit: eecc1c218f350d21696a4561304eb602b6b481f7
Author: Brian Evans gentoo org>
AuthorDate: Thu Apr 4 13:01:58 2019 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Apr 4 13:01:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eecc1c21
sys-cluster/galera: Version bump for 25.3.26
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Brian Evans gentoo.org>
sys-cluster/galera/Manifest| 1 +
.../files/galera-4.1-strip-extra-cflags.patch | 78 +++
sys-cluster/galera/galera-25.3.26.ebuild | 89 ++
3 files changed, 168 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index a57bcbf8a0d..fbf08c233a0 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,3 +1,4 @@
+DIST galera-25.3.26.tar.gz 3386588 BLAKE2B
ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4
SHA512
c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
DIST galera-3-25.3.23.tar.gz 3328961 BLAKE2B
d11c6d00fda367fc961a5387865afa74e1ed0ed04094a4ab3c5ab23c7a915131b867a85f74079dc472df745762346b8b9fd371d5d0d0406e20274d51917129b5
SHA512
5b6a61ddd1505f9e2f9e3c592d65e17ee55ee78187d423f8f963d9c7b8deed2c1ade3425262d0a89622693853dff95d429861c955b2d051433dda8929d9f92d1
DIST galera-3-25.3.24.tar.gz 3373375 BLAKE2B
db837add9d74e2acb312bd974f00b52d269f1c5995036b468f309da43605b817fac16f17c30e96c27e17657708870d329b41eafa9ad214d8cb5f1b4fbb468182
SHA512
874c6ee77be54a0bcd6d36b67f8e99d12dabd85433dd1f0e026b7994746679cc7ffebcf721445dfd1714f89c7594fc0b0137e725d220d3bb45fd325e64e16185
DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B
892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216
SHA512
bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
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 000..dfa1642c7d7
--- /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.0 -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
