* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2015-08-18 20:37 Brian Evans
0 siblings, 0 replies; 11+ messages in thread
From: Brian Evans @ 2015-08-18 20:37 UTC (permalink / raw
To: gentoo-commits
commit: 7bc2bba0d3610ed3c482bd329a39c81227008539
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 20:41:08 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 20:41:08 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc2bba0
sys-cluster/galera: Remove netcat which is no longer needed in the init
Upstream https://github.com/codership/galera/commit/6209a777da487764a728fcb6e9e1f20f82968ee0
removes it
Package-Manager: portage-2.2.20.1
sys-cluster/galera/files/garb.sh | 20 +++-----------------
sys-cluster/galera/galera-25.3.10.ebuild | 8 +-------
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
index 63e88df..da7d550 100644
--- a/sys-cluster/galera/files/garb.sh
+++ b/sys-cluster/galera/files/garb.sh
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
depend() {
@@ -22,21 +22,7 @@ start() {
GALERA_PORT="${GALERA_PORT:-4567}"
- for ADDRESS in ${GALERA_NODES} 0; do
- HOST=$(echo $ADDRESS | cut -d \: -f 1 )
- PORT=$(echo $ADDRESS | cut -d \: -f 2 )
- if [ "x${HOST}" = "x${PORT}" ]; then
- PORT=${GALERA_PORT}
- fi
- PORT=${PORT:-$GALERA_PORT}
- nc -z ${HOST} ${PORT} > /dev/null && break
- done
- if [ ${ADDRESS} = "0" ]; then
- eerror "None of the nodes in GALERA_NODES is accessible"
- return 1
- fi
-
- OPTIONS="-a gcomm://${ADDRESS} -g ${GALERA_GROUP}"
+ OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}"
[ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
[ -n "${LOG_FILE}" ] && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
diff --git a/sys-cluster/galera/galera-25.3.10.ebuild b/sys-cluster/galera/galera-25.3.10.ebuild
index bbaad5a..96a2e5c 100644
--- a/sys-cluster/galera/galera-25.3.10.ebuild
+++ b/sys-cluster/galera/galera-25.3.10.ebuild
@@ -28,13 +28,7 @@ DEPEND="${DEPEND}
>=dev-cpp/asio-1.4.8[ssl?]
"
#Run time only
-RDEPEND="${CDEPEND}
- garbd? ( || (
- net-analyzer/netcat
- net-analyzer/netcat6
- net-analyzer/gnu-netcat
- net-analyzer/openbsd-netcat
- ) )"
+RDEPEND="${CDEPEND}"
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2015-09-15 14:01 Brian Evans
0 siblings, 0 replies; 11+ messages in thread
From: Brian Evans @ 2015-09-15 14:01 UTC (permalink / raw
To: gentoo-commits
commit: 1b780046438981cab754ea7709b347f3e829d7b1
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 14:05:52 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 14:05:52 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b780046
sys-cluster/galera: Version bump
Package-Manager: portage-2.2.20.1
sys-cluster/galera/Manifest | 1 +
| 21 +++++
.../files/galera-3.12-strip-machine-cflags.patch | 64 +++++++++++++++
sys-cluster/galera/galera-25.3.12.ebuild | 90 ++++++++++++++++++++++
4 files changed, 176 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 008ff6d..2f875c5 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,2 +1,3 @@
DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d
DIST galera-3-25.3.10.tar.gz 2990393 SHA256 5281cef0c26e409f93184a08fe3668bc0891aeec9710ffebc66402091d005d1d SHA512 d2fc09a9d274199650e29c7492a736a6518655458b6cad9ba960282928ec2d0f8187d35ee439c93a57ecb0f1b6a66b83474128f71ad67724cc784a887fc2172d WHIRLPOOL 294feec18418f69d7f1f1d416fc9893e403555d525851e3a4c1996bd9f0bf5689588ae930f77ad8c691a0c7c30d11c62f4928519a7b3722e9976ec5ee57931e5
+DIST galera-3-25.3.12.tar.gz 2989294 SHA256 2941cece3aa12d34bd454de8c3d2c4796a47dcfaef643e97d1b94462aa32e126 SHA512 6c18327d786a0c549b89a8668c302e3221d1f7586b271e927ca511ac9e8ee4413315641f6a43814b49e9231cdcd4c76dcd8e975098f768ea8d9f4638b1391e62 WHIRLPOOL b0067ade420c49d374baf901472841ff21ccbd73c1ef7eb7b48f7e591954f875fc5993664c54daa1e400e37cc0647f1a39515129e2d6789035de3dba0edb6d7e
--git a/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch b/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch
new file mode 100644
index 0000000..1939425
--- /dev/null
+++ b/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch
@@ -0,0 +1,21 @@
+diff -aurN a/chromium/build_config.h b/chromium/build_config.h
+--- a/chromium/build_config.h 2015-08-27 03:32:41.000000000 -0400
++++ b/chromium/build_config.h 2015-09-15 09:50:21.765091000 -0400
+@@ -46,8 +46,6 @@
+ #elif defined(__sun)
+ #define OS_SOLARIS 1
+ #define TOOLKIT_GTK
+-#else
+-#error Please add support for your platform in build/build_config.h
+ #endif
+
+ #if defined(USE_OPENSSL) && defined(USE_NSS)
+@@ -132,8 +130,6 @@
+ #define ARCH_CPU_32_BITS 1
+ #endif
+ #define ARCH_CPU_BIG_ENDIAN 1
+-#else
+-#error Please add support for your architecture in build/build_config.h
+ #endif
+
+ // Type detection for wchar_t.
diff --git a/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch b/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch
new file mode 100644
index 0000000..414996b
--- /dev/null
+++ b/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch
@@ -0,0 +1,64 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -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()
+
+@@ -33,21 +33,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')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+ libgalerautils_objs + crc32c_objs)
+
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct 2015-09-15 09:15:07.770091000 -0400
++++ b/SConstruct 2015-09-15 09:18:41.160091000 -0400
+@@ -87,29 +87,6 @@
+ if dbug:
+ opt_flags = opt_flags + ' -DGU_DBUG_ON'
+
+-if sysname == 'sunos':
+- compile_arch = ' -mtune=native'
+- link_arch = ''
+-elif x86:
+- if bits == 32:
+- compile_arch = ' -m32 -march=i686'
+- link_arch = compile_arch
+- if sysname == 'linux':
+- link_arch = link_arch + ' -Wl,-melf_i386'
+- else:
+- compile_arch = ' -m64'
+- link_arch = compile_arch
+- if sysname == 'linux':
+- link_arch = link_arch + ' -Wl,-melf_x86_64'
+-elif machine == 's390x':
+- compile_arch = ' -mzarch -march=z196 -mtune=zEC12'
+- link_arch = ''
+- if bits == 32:
+- compile_arch += ' -m32'
+-else:
+- compile_arch = ' -mtune=native'
+- link_arch = ''
+-
+
+ boost = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
diff --git a/sys-cluster/galera/galera-25.3.12.ebuild b/sys-cluster/galera/galera-25.3.12.ebuild
new file mode 100644
index 0000000..ca0cb73
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.12.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-3-${PV}"
+
+inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
+DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+HOMEPAGE="http://www.galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd ssl test"
+
+CDEPEND="
+ ssl? ( dev-libs/openssl:0= )
+ >=dev-libs/boost-1.41:0=
+ "
+DEPEND="${DEPEND}
+ ${CDEPEND}
+ dev-libs/check
+ >=sys-devel/gcc-4.4
+ >=dev-cpp/asio-1.4.8[ssl?]
+ "
+#Run time only
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+ if use garbd ; then
+ enewgroup garbd
+ enewuser garbd -1 -1 -1 garbd
+ fi
+}
+
+src_prepare() {
+ # Remove bundled dev-cpp/asio
+ rm -r "${S}/asio" || die
+
+ # Respect {C,LD}FLAGS.
+ epatch "${FILESDIR}/respect-flags.patch" \
+ "${FILESDIR}/galera-3.12-strip-machine-cflags.patch" \
+ "${FILESDIR}/galera-3.12-strip-extra-buildconfig.patch"
+
+ #Remove optional garbd daemon
+ if ! use garbd ; then
+ rm -r "${S}/garb" || die
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ tc-export 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
+ else
+ append-cflags -DCRC32C_NO_HARDWARE
+ fi
+ # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+ # and -Wold-style-cast
+ myesconsargs=(
+ $(use_scons ssl ssl 1 0)
+ $(use_scons test tests 1 0)
+ strict_build_flags=0
+ )
+}
+
+src_compile() {
+ escons --warn=no-missing-sconscript
+}
+
+src_install() {
+ dodoc scripts/packages/README scripts/packages/README-MySQL
+ if use garbd ; then
+ dobin garb/garbd
+ newconfd "${FILESDIR}/garb.cnf" garbd
+ newinitd "${FILESDIR}/garb.sh" garbd
+ doman man/garbd.8
+ fi
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe libgalera_smm.so
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2015-11-20 21:14 Brian Evans
0 siblings, 0 replies; 11+ messages in thread
From: Brian Evans @ 2015-11-20 21:14 UTC (permalink / raw
To: gentoo-commits
commit: 6364233eac2a78d83a5dddf240c677bc71055b80
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 21:13:51 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 21:13:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6364233e
sys-cluster/galera: Version bump
Package-Manager: portage-2.2.25
sys-cluster/galera/Manifest | 1 +
| 70 +++++++++++++++++
sys-cluster/galera/galera-25.3.13.ebuild | 88 ++++++++++++++++++++++
3 files changed, 159 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 08cc646..f4776ed 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,2 +1,3 @@
DIST galera-3-25.3.10.tar.gz 2990393 SHA256 5281cef0c26e409f93184a08fe3668bc0891aeec9710ffebc66402091d005d1d SHA512 d2fc09a9d274199650e29c7492a736a6518655458b6cad9ba960282928ec2d0f8187d35ee439c93a57ecb0f1b6a66b83474128f71ad67724cc784a887fc2172d WHIRLPOOL 294feec18418f69d7f1f1d416fc9893e403555d525851e3a4c1996bd9f0bf5689588ae930f77ad8c691a0c7c30d11c62f4928519a7b3722e9976ec5ee57931e5
DIST galera-3-25.3.12.tar.gz 2989294 SHA256 2941cece3aa12d34bd454de8c3d2c4796a47dcfaef643e97d1b94462aa32e126 SHA512 6c18327d786a0c549b89a8668c302e3221d1f7586b271e927ca511ac9e8ee4413315641f6a43814b49e9231cdcd4c76dcd8e975098f768ea8d9f4638b1391e62 WHIRLPOOL b0067ade420c49d374baf901472841ff21ccbd73c1ef7eb7b48f7e591954f875fc5993664c54daa1e400e37cc0647f1a39515129e2d6789035de3dba0edb6d7e
+DIST galera-3-25.3.13.tar.gz 2989201 SHA256 193db0c1ccf1c3cfbd46b23d26441fe022ffe82788ed467c6b2df02abc4b814d SHA512 6c83dca5f6087cfbbc6aa30ac4b3f47ce08e7d958875f5c07c260ec8e9677c0e3d9e1ebb347615e0842e85f952c8b7713ee02f6148c9049ae336b29c28dc2ade WHIRLPOOL f6fcda502c3145d0430496a4de9e2368e102769a254d905fb9594b082e9bc386ab6a40edc00e084a3dfa04f800368e45d449f94a634343a8d4f61725c849f23b
--git a/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch
new file mode 100644
index 0000000..972152d
--- /dev/null
+++ b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch
@@ -0,0 +1,70 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -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')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+ libgalerautils_objs + crc32c_objs)
+
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct 2015-09-15 09:15:07.770091000 -0400
++++ b/SConstruct 2015-09-15 09:18:41.160091000 -0400
+@@ -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 = ''
+@@ -97,26 +97,6 @@
+ 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 -march=z196 -mtune=zEC12'
+- if bits == 32:
+- compile_arch += ' -m32'
+-
+ boost = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
+ ssl = int(ARGUMENTS.get('ssl', 1))
diff --git a/sys-cluster/galera/galera-25.3.13.ebuild b/sys-cluster/galera/galera-25.3.13.ebuild
new file mode 100644
index 0000000..6479436
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.13.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-3-${PV}"
+
+inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://www.galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd ssl test"
+
+CDEPEND="
+ ssl? ( dev-libs/openssl:0= )
+ >=dev-libs/boost-1.41:0=
+ "
+DEPEND="${DEPEND}
+ ${CDEPEND}
+ dev-libs/check
+ >=sys-devel/gcc-4.4
+ >=dev-cpp/asio-1.4.8[ssl?]
+ "
+#Run time only
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+ if use garbd ; then
+ enewgroup garbd
+ enewuser garbd -1 -1 -1 garbd
+ fi
+}
+
+src_prepare() {
+ # Remove bundled dev-cpp/asio
+ rm -r "${S}/asio" || die
+
+ # Respect {C,LD}FLAGS.
+ epatch "${FILESDIR}/galera-3.13-strip-extra-cflags.patch"
+
+ #Remove optional garbd daemon
+ if ! use garbd ; then
+ rm -r "${S}/garb" || die
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ tc-export 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
+ else
+ append-cflags -DCRC32C_NO_HARDWARE
+ fi
+ # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+ # and -Wold-style-cast
+ myesconsargs=(
+ $(use_scons ssl ssl 1 0)
+ $(use_scons test tests 1 0)
+ strict_build_flags=0
+ )
+}
+
+src_compile() {
+ escons --warn=no-missing-sconscript
+}
+
+src_install() {
+ dodoc scripts/packages/README scripts/packages/README-MySQL
+ if use garbd ; then
+ dobin garb/garbd
+ newconfd "${FILESDIR}/garb.cnf" garbd
+ newinitd "${FILESDIR}/garb.sh" garbd
+ doman man/garbd.8
+ fi
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe libgalera_smm.so
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2016-03-18 14:30 Brian Evans
0 siblings, 0 replies; 11+ messages in thread
From: Brian Evans @ 2016-03-18 14:30 UTC (permalink / raw
To: gentoo-commits
commit: d31404b2a9c4af631b3010fa20230067a664677a
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 14:27:29 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 14:27:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31404b2
sys-cluster/galera: Version bump to 25.3.15
Package-Manager: portage-2.2.28
sys-cluster/galera/Manifest | 1 +
| 70 +++++++++++++++++
sys-cluster/galera/galera-25.3.15.ebuild | 87 ++++++++++++++++++++++
3 files changed, 158 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 3fee0c4..f994ef4 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -2,3 +2,4 @@ DIST galera-3-25.3.10.tar.gz 2990393 SHA256 5281cef0c26e409f93184a08fe3668bc0891
DIST galera-3-25.3.12.tar.gz 2989294 SHA256 2941cece3aa12d34bd454de8c3d2c4796a47dcfaef643e97d1b94462aa32e126 SHA512 6c18327d786a0c549b89a8668c302e3221d1f7586b271e927ca511ac9e8ee4413315641f6a43814b49e9231cdcd4c76dcd8e975098f768ea8d9f4638b1391e62 WHIRLPOOL b0067ade420c49d374baf901472841ff21ccbd73c1ef7eb7b48f7e591954f875fc5993664c54daa1e400e37cc0647f1a39515129e2d6789035de3dba0edb6d7e
DIST galera-3-25.3.13.tar.gz 2989201 SHA256 193db0c1ccf1c3cfbd46b23d26441fe022ffe82788ed467c6b2df02abc4b814d SHA512 6c83dca5f6087cfbbc6aa30ac4b3f47ce08e7d958875f5c07c260ec8e9677c0e3d9e1ebb347615e0842e85f952c8b7713ee02f6148c9049ae336b29c28dc2ade WHIRLPOOL f6fcda502c3145d0430496a4de9e2368e102769a254d905fb9594b082e9bc386ab6a40edc00e084a3dfa04f800368e45d449f94a634343a8d4f61725c849f23b
DIST galera-3-25.3.14.tar.gz 2990021 SHA256 b090b818f27dbcf5318c0975dc888a10847931b97e94d9bd69b3cd35848e0716 SHA512 98400d1a153cca41389a2f4cd6918c4a042f14b473a006e1bfacde19068dc8a253a2ba743c666b1762033c97e9aa352eff4804c0d20387daf284240bd2ae020b WHIRLPOOL 4e67b5d746f9a374f168c5706a8599bc6d299e9fd4072adfc13b1f4c470ab79ec1c312d6f856002c400b53941f438631799dd9feea6b7d5cf5445b799b41dfef
+DIST galera-3-25.3.15.tar.gz 2994995 SHA256 0de1c1c8304e7f1dfa43ef2a2b15c8ca724556d5b187c31c8a93c755737163af SHA512 717c431d29653cba3252dae5a845e82c02e4cb122a6477253e68688600bf130a753f89f94b7b2461695ede9033ca0107324831d2c5b7d2d0479a0936d2779e84 WHIRLPOOL e0fa0de7e0a75563f78feec488fda64bc4ec9cc97a369e18fbf3c817c520a8a5e3118a4c95f14cf987f019f4f9c96f86df32c4b87c66ec7750c401e0017daf76
--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
new file mode 100644
index 0000000..b47ec39
--- /dev/null
+++ b/sys-cluster/galera/files/galera-3.15-strip-extra-cflags.patch
@@ -0,0 +1,70 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -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')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+ libgalerautils_objs + crc32c_objs)
+
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct 2015-09-15 09:15:07.770091000 -0400
++++ b/SConstruct 2015-09-15 09:18:41.160091000 -0400
+@@ -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 = ''
+@@ -97,26 +97,6 @@
+ 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))
+ ssl = int(ARGUMENTS.get('ssl', 1))
diff --git a/sys-cluster/galera/galera-25.3.15.ebuild b/sys-cluster/galera/galera-25.3.15.ebuild
new file mode 100644
index 0000000..f3b2b29
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.15.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_P="${PN}-3-${PV}"
+
+inherit scons-utils toolchain-funcs user flag-o-matic
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://www.galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+
+CDEPEND="
+ dev-libs/openssl:0=
+ >=dev-libs/boost-1.41:0=
+ "
+DEPEND="${DEPEND}
+ ${CDEPEND}
+ dev-libs/check
+ >=sys-devel/gcc-4.4
+ >=dev-cpp/asio-1.10.1[ssl]
+ "
+#Run time only
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+# Respect {C,LD}FLAGS.
+PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
+
+pkg_preinst() {
+ if use garbd ; then
+ enewgroup garbd
+ enewuser garbd -1 -1 -1 garbd
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Remove bundled dev-cpp/asio
+ rm -r "${S}/asio" || die
+
+ #Remove optional garbd daemon
+ if ! use garbd ; then
+ rm -r "${S}/garb" || die
+ fi
+}
+
+src_configure() {
+ tc-export 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
+ else
+ append-cflags -DCRC32C_NO_HARDWARE
+ fi
+ # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+ # and -Wold-style-cast
+ MYSCONS=(
+ ssl=1
+ tests=$(usex test 1 0)
+ strict_build_flags=0
+ )
+}
+
+src_compile() {
+ escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+ dodoc scripts/packages/README scripts/packages/README-MySQL
+ if use garbd ; then
+ dobin garb/garbd
+ newconfd "${FILESDIR}/garb.cnf" garbd
+ newinitd "${FILESDIR}/garb.sh" garbd
+ doman man/garbd.8
+ fi
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe libgalera_smm.so
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2016-03-18 14:30 Brian Evans
0 siblings, 0 replies; 11+ messages in thread
From: Brian Evans @ 2016-03-18 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 0f878cbde7f6540b3bcbef549ea0e86a022d9816
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 14:30:14 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 14:30:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f878cbd
sys-cluster/galera: Drop old versions
Package-Manager: portage-2.2.28
sys-cluster/galera/Manifest | 4 -
sys-cluster/galera/files/disable-tests.patch | 80 -------------------
| 21 -----
.../files/galera-3.12-strip-machine-cflags.patch | 64 ---------------
| 70 -----------------
.../galera/files/galera-strip-machine-cflags.patch | 62 ---------------
sys-cluster/galera/files/respect-flags.patch | 35 ---------
sys-cluster/galera/galera-25.3.10.ebuild | 89 ---------------------
sys-cluster/galera/galera-25.3.12.ebuild | 90 ----------------------
sys-cluster/galera/galera-25.3.13.ebuild | 88 ---------------------
sys-cluster/galera/galera-25.3.14.ebuild | 87 ---------------------
11 files changed, 690 deletions(-)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index f994ef4..8ff186d 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,5 +1 @@
-DIST galera-3-25.3.10.tar.gz 2990393 SHA256 5281cef0c26e409f93184a08fe3668bc0891aeec9710ffebc66402091d005d1d SHA512 d2fc09a9d274199650e29c7492a736a6518655458b6cad9ba960282928ec2d0f8187d35ee439c93a57ecb0f1b6a66b83474128f71ad67724cc784a887fc2172d WHIRLPOOL 294feec18418f69d7f1f1d416fc9893e403555d525851e3a4c1996bd9f0bf5689588ae930f77ad8c691a0c7c30d11c62f4928519a7b3722e9976ec5ee57931e5
-DIST galera-3-25.3.12.tar.gz 2989294 SHA256 2941cece3aa12d34bd454de8c3d2c4796a47dcfaef643e97d1b94462aa32e126 SHA512 6c18327d786a0c549b89a8668c302e3221d1f7586b271e927ca511ac9e8ee4413315641f6a43814b49e9231cdcd4c76dcd8e975098f768ea8d9f4638b1391e62 WHIRLPOOL b0067ade420c49d374baf901472841ff21ccbd73c1ef7eb7b48f7e591954f875fc5993664c54daa1e400e37cc0647f1a39515129e2d6789035de3dba0edb6d7e
-DIST galera-3-25.3.13.tar.gz 2989201 SHA256 193db0c1ccf1c3cfbd46b23d26441fe022ffe82788ed467c6b2df02abc4b814d SHA512 6c83dca5f6087cfbbc6aa30ac4b3f47ce08e7d958875f5c07c260ec8e9677c0e3d9e1ebb347615e0842e85f952c8b7713ee02f6148c9049ae336b29c28dc2ade WHIRLPOOL f6fcda502c3145d0430496a4de9e2368e102769a254d905fb9594b082e9bc386ab6a40edc00e084a3dfa04f800368e45d449f94a634343a8d4f61725c849f23b
-DIST galera-3-25.3.14.tar.gz 2990021 SHA256 b090b818f27dbcf5318c0975dc888a10847931b97e94d9bd69b3cd35848e0716 SHA512 98400d1a153cca41389a2f4cd6918c4a042f14b473a006e1bfacde19068dc8a253a2ba743c666b1762033c97e9aa352eff4804c0d20387daf284240bd2ae020b WHIRLPOOL 4e67b5d746f9a374f168c5706a8599bc6d299e9fd4072adfc13b1f4c470ab79ec1c312d6f856002c400b53941f438631799dd9feea6b7d5cf5445b799b41dfef
DIST galera-3-25.3.15.tar.gz 2994995 SHA256 0de1c1c8304e7f1dfa43ef2a2b15c8ca724556d5b187c31c8a93c755737163af SHA512 717c431d29653cba3252dae5a845e82c02e4cb122a6477253e68688600bf130a753f89f94b7b2461695ede9033ca0107324831d2c5b7d2d0479a0936d2779e84 WHIRLPOOL e0fa0de7e0a75563f78feec488fda64bc4ec9cc97a369e18fbf3c817c520a8a5e3118a4c95f14cf987f019f4f9c96f86df32c4b87c66ec7750c401e0017daf76
diff --git a/sys-cluster/galera/files/disable-tests.patch b/sys-cluster/galera/files/disable-tests.patch
deleted file mode 100644
index b82294b..0000000
--- a/sys-cluster/galera/files/disable-tests.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -aurN a/galera/SConscript b/galera/SConscript
---- a/galera/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/galera/SConscript 2013-05-13 13:13:20.851827437 -0400
-@@ -1,2 +1,2 @@
-
--SConscript(['src/SConscript', 'tests/SConscript'])
-+SConscript(['src/SConscript'])
-diff -aurN a/galerautils/SConscript b/galerautils/SConscript
---- a/galerautils/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/galerautils/SConscript 2013-05-13 13:15:37.010071765 -0400
-@@ -1,3 +1,3 @@
- # SConscript for building galerautils
-
--SConscript(Split('''src/SConscript tests/SConscript'''))
-+SConscript(Split('''src/SConscript'''))
-diff -aurN a/gcache/SConscript b/gcache/SConscript
---- a/gcache/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/gcache/SConscript 2013-05-13 13:15:55.179837389 -0400
-@@ -1,3 +1,3 @@
- # SConscript for building galerautils
-
--SConscript(Split('''src/SConscript tests/SConscript'''))
-+SConscript(Split('''src/SConscript'''))
-diff -aurN a/gcomm/SConscript b/gcomm/SConscript
---- a/gcomm/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/gcomm/SConscript 2013-05-13 13:16:08.979659369 -0400
-@@ -1,3 +1,3 @@
- # SCons build script for building gcomm
-
--SConscript(Split('''src/SConscript test/SConscript'''))
-+SConscript(Split('''src/SConscript'''))
-diff -aurN a/gcs/src/SConscript b/gcs/src/SConscript
---- a/gcs/src/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/gcs/src/SConscript 2013-05-13 13:12:53.122184848 -0400
-@@ -46,8 +46,6 @@
- source = 'gcs_test.c',
- LINK = libgcs_env['CXX'])
-
--SConscript('unit_tests/SConscript')
--
- #
- env.Append(LIBGALERA_OBJS = libgcs_env.SharedObject(libgcs_sources))
-
-diff -aurN a/SConstruct b/SConstruct
---- a/SConstruct 2013-03-11 02:44:50.000000000 -0400
-+++ b/SConstruct 2013-05-13 13:11:03.493597370 -0400
-@@ -305,20 +305,6 @@
- # Clone base from default environment
- check_env = env.Clone()
-
--conf = Configure(check_env)
--
--# Check header and library
--
--if not conf.CheckHeader('check.h'):
-- print 'Error: check header file not found or not usable'
-- Exit(1)
--
--if not conf.CheckLib('check'):
-- print 'Error: check library not found or not usable'
-- Exit(1)
--
--conf.Finish()
--
- # Note: Don't do this, glibc does not like static linking
- # Link unit tests statically
- # check_env.Append(LINKFLAGS = ' -static')
-@@ -328,11 +314,7 @@
- #
-
- def builder_unit_test(target, source, env):
-- app = str(source[0].abspath)
-- if os.spawnl(os.P_WAIT, app, app)==0:
-- open(str(target[0]),'w').write("PASSED\n")
-- else:
-- return 1
-+ print("Disabled\n")
- # Create a builder for tests
- bld = Builder(action = builder_unit_test)
- check_env.Append(BUILDERS = {'Test' : bld})
diff --git a/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch b/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch
deleted file mode 100644
index 1939425..0000000
--- a/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aurN a/chromium/build_config.h b/chromium/build_config.h
---- a/chromium/build_config.h 2015-08-27 03:32:41.000000000 -0400
-+++ b/chromium/build_config.h 2015-09-15 09:50:21.765091000 -0400
-@@ -46,8 +46,6 @@
- #elif defined(__sun)
- #define OS_SOLARIS 1
- #define TOOLKIT_GTK
--#else
--#error Please add support for your platform in build/build_config.h
- #endif
-
- #if defined(USE_OPENSSL) && defined(USE_NSS)
-@@ -132,8 +130,6 @@
- #define ARCH_CPU_32_BITS 1
- #endif
- #define ARCH_CPU_BIG_ENDIAN 1
--#else
--#error Please add support for your architecture in build/build_config.h
- #endif
-
- // Type detection for wchar_t.
diff --git a/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch b/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch
deleted file mode 100644
index 414996b..0000000
--- a/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
---- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -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()
-
-@@ -33,21 +33,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')
--
- libgalerautils_env.StaticLibrary('galerautils',
- libgalerautils_objs + crc32c_objs)
-
-diff -aurN a/SConstruct b/SConstruct
---- a/SConstruct 2015-09-15 09:15:07.770091000 -0400
-+++ b/SConstruct 2015-09-15 09:18:41.160091000 -0400
-@@ -87,29 +87,6 @@
- if dbug:
- opt_flags = opt_flags + ' -DGU_DBUG_ON'
-
--if sysname == 'sunos':
-- compile_arch = ' -mtune=native'
-- link_arch = ''
--elif x86:
-- if bits == 32:
-- compile_arch = ' -m32 -march=i686'
-- link_arch = compile_arch
-- if sysname == 'linux':
-- link_arch = link_arch + ' -Wl,-melf_i386'
-- else:
-- compile_arch = ' -m64'
-- link_arch = compile_arch
-- if sysname == 'linux':
-- link_arch = link_arch + ' -Wl,-melf_x86_64'
--elif machine == 's390x':
-- compile_arch = ' -mzarch -march=z196 -mtune=zEC12'
-- link_arch = ''
-- if bits == 32:
-- compile_arch += ' -m32'
--else:
-- compile_arch = ' -mtune=native'
-- link_arch = ''
--
-
- boost = int(ARGUMENTS.get('boost', 1))
- boost_pool = int(ARGUMENTS.get('boost_pool', 0))
diff --git a/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch
deleted file mode 100644
index 972152d..0000000
--- a/sys-cluster/galera/files/galera-3.13-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.000000000 -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')
--
- libgalerautils_env.StaticLibrary('galerautils',
- libgalerautils_objs + crc32c_objs)
-
-diff -aurN a/SConstruct b/SConstruct
---- a/SConstruct 2015-09-15 09:15:07.770091000 -0400
-+++ b/SConstruct 2015-09-15 09:18:41.160091000 -0400
-@@ -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 = ''
-@@ -97,26 +97,6 @@
- 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 -march=z196 -mtune=zEC12'
-- if bits == 32:
-- compile_arch += ' -m32'
--
- boost = int(ARGUMENTS.get('boost', 1))
- boost_pool = int(ARGUMENTS.get('boost_pool', 0))
- ssl = int(ARGUMENTS.get('ssl', 1))
diff --git a/sys-cluster/galera/files/galera-strip-machine-cflags.patch b/sys-cluster/galera/files/galera-strip-machine-cflags.patch
deleted file mode 100644
index 5aca0f7..0000000
--- a/sys-cluster/galera/files/galera-strip-machine-cflags.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
---- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -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()
-
-@@ -33,21 +33,6 @@
- crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
- crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
-
--if x86 != 0:
-- 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 2015-04-07 14:53:59.810301200 -0400
-+++ b/SConstruct 2015-04-07 14:54:48.700301200 -0400
-@@ -87,27 +87,6 @@
- opt_flags = opt_flags + ' -DGU_DBUG_ON'
-
-
--if x86 == 32:
-- compile_arch = ' -m32 -march=i686'
-- link_arch = compile_arch
-- if sysname == 'linux':
-- link_arch = link_arch + ' -Wl,-melf_i386'
--elif x86 == 64 and sysname != 'sunos':
-- compile_arch = ' -m64'
-- link_arch = compile_arch
-- if sysname == 'linux':
-- link_arch = link_arch + ' -Wl,-melf_x86_64'
--elif machine == 'ppc64':
-- compile_arch = ' -mtune=native'
-- link_arch = ''
--elif sysname == 'sunos':
-- compile_arch = ' -mtune=native'
-- link_arch = ''
--else:
-- compile_arch = ''
-- link_arch = ''
--
--
- boost = int(ARGUMENTS.get('boost', 1))
- boost_pool = int(ARGUMENTS.get('boost_pool', 0))
- ssl = int(ARGUMENTS.get('ssl', 1))
diff --git a/sys-cluster/galera/files/respect-flags.patch b/sys-cluster/galera/files/respect-flags.patch
deleted file mode 100644
index d7e5f37..0000000
--- a/sys-cluster/galera/files/respect-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/SConstruct 2014-03-07 14:27:26.797904671 -0500
-+++ b/SConstruct 2014-03-07 14:31:18.672478115 -0500
-@@ -49,7 +49,7 @@
- build_target = 'all'
-
- # Optimization level
--opt_flags = ' -g -O3 -DNDEBUG'
-+opt_flags = ' -DNDEBUG'
-
- # Architecture (defaults to build host type)
- compile_arch = ''
-@@ -214,12 +214,12 @@
- ' -Wall -Wextra -Wno-unused-parameter')
-
- # C-specific flags
--env.Replace(CFLAGS = ' -std=c99 -fno-strict-aliasing -pipe')
-+env.Replace(CFLAGS = os.getenv('CFLAGS','') + ' -std=c99 -fno-strict-aliasing -pipe')
-
- # CXX-specific flags
- # Note: not all 3rd-party libs like '-Wold-style-cast -Weffc++'
- # adding those after checks
--env.Replace(CXXFLAGS = ' -Wno-long-long -Wno-deprecated -ansi')
-+env.Replace(CXXFLAGS = os.getenv('CXXFLAGS','') + ' -Wno-long-long -Wno-deprecated -ansi')
- if sysname != 'sunos':
- env.Append(CXXFLAGS = ' -pipe')
-
-@@ -228,7 +228,7 @@
- # TODO: enable '-Wl,--warn-common -Wl,--fatal-warnings' after warnings from
- # static linking have beed addressed
- #
--env.Append(LINKFLAGS = link_arch)
-+env.Append(LINKFLAGS = link_arch + ' ' + os.getenv('LDFLAGS',''))
-
- #
- # Check required headers and libraries (autoconf functionality)
diff --git a/sys-cluster/galera/galera-25.3.10.ebuild b/sys-cluster/galera/galera-25.3.10.ebuild
deleted file mode 100644
index 98c8a2d..0000000
--- a/sys-cluster/galera/galera-25.3.10.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd ssl test"
-
-CDEPEND="
- ssl? ( dev-libs/openssl:0= )
- >=dev-libs/boost-1.41:0=
- "
-DEPEND="${DEPEND}
- ${CDEPEND}
- dev-libs/check
- >=sys-devel/gcc-4.4
- >=dev-cpp/asio-1.4.8[ssl?]
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_preinst() {
- if use garbd ; then
- enewgroup garbd
- enewuser garbd -1 -1 -1 garbd
- fi
-}
-
-src_prepare() {
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- # Respect {C,LD}FLAGS.
- epatch "${FILESDIR}/respect-flags.patch" \
- "${FILESDIR}/galera-strip-machine-cflags.patch"
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-
- epatch_user
-}
-
-src_configure() {
- tc-export 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
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- myesconsargs=(
- $(use_scons ssl ssl 1 0)
- $(use_scons test tests 1 0)
- strict_build_flags=0
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.sh" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.12.ebuild b/sys-cluster/galera/galera-25.3.12.ebuild
deleted file mode 100644
index 760c3ff..0000000
--- a/sys-cluster/galera/galera-25.3.12.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd ssl test"
-
-CDEPEND="
- ssl? ( dev-libs/openssl:0= )
- >=dev-libs/boost-1.41:0=
- "
-DEPEND="${DEPEND}
- ${CDEPEND}
- dev-libs/check
- >=sys-devel/gcc-4.4
- >=dev-cpp/asio-1.4.8[ssl?]
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_preinst() {
- if use garbd ; then
- enewgroup garbd
- enewuser garbd -1 -1 -1 garbd
- fi
-}
-
-src_prepare() {
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- # Respect {C,LD}FLAGS.
- epatch "${FILESDIR}/respect-flags.patch" \
- "${FILESDIR}/galera-3.12-strip-machine-cflags.patch" \
- "${FILESDIR}/galera-3.12-strip-extra-buildconfig.patch"
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-
- epatch_user
-}
-
-src_configure() {
- tc-export 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
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- myesconsargs=(
- $(use_scons ssl ssl 1 0)
- $(use_scons test tests 1 0)
- strict_build_flags=0
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.sh" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.13.ebuild b/sys-cluster/galera/galera-25.3.13.ebuild
deleted file mode 100644
index 4dd346b..0000000
--- a/sys-cluster/galera/galera-25.3.13.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd ssl test"
-
-CDEPEND="
- ssl? ( dev-libs/openssl:0= )
- >=dev-libs/boost-1.41:0=
- "
-DEPEND="${DEPEND}
- ${CDEPEND}
- dev-libs/check
- >=sys-devel/gcc-4.4
- >=dev-cpp/asio-1.4.8[ssl?]
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_preinst() {
- if use garbd ; then
- enewgroup garbd
- enewuser garbd -1 -1 -1 garbd
- fi
-}
-
-src_prepare() {
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- # Respect {C,LD}FLAGS.
- epatch "${FILESDIR}/galera-3.13-strip-extra-cflags.patch"
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-
- epatch_user
-}
-
-src_configure() {
- tc-export 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
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- myesconsargs=(
- $(use_scons ssl ssl 1 0)
- $(use_scons test tests 1 0)
- strict_build_flags=0
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.sh" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.14.ebuild b/sys-cluster/galera/galera-25.3.14.ebuild
deleted file mode 100644
index 1adeac3..0000000
--- a/sys-cluster/galera/galera-25.3.14.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
- dev-libs/openssl:0=
- >=dev-libs/boost-1.41:0=
- "
-DEPEND="${DEPEND}
- ${CDEPEND}
- dev-libs/check
- >=sys-devel/gcc-4.4
- >=dev-cpp/asio-1.10.1[ssl]
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.13-strip-extra-cflags.patch" )
-
-pkg_preinst() {
- if use garbd ; then
- enewgroup garbd
- enewuser garbd -1 -1 -1 garbd
- fi
-}
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export 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
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- ssl=1
- tests=$(usex test 1 0)
- strict_build_flags=0
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.sh" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2016-08-11 19:04 Brian Evans
0 siblings, 0 replies; 11+ messages in thread
From: Brian Evans @ 2016-08-11 19:04 UTC (permalink / raw
To: gentoo-commits
commit: fbac5e93460b4e3d06037d73e5a519449c8118b2
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 19:03:00 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 19:04:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbac5e93
sys-cluster/galera: Version bump
Include Node name change for garbd wrt bug 581518
Package-Manager: portage-2.3.0
sys-cluster/galera/Manifest | 1 +
sys-cluster/galera/files/garb.cnf | 3 ++
sys-cluster/galera/files/garb.sh | 6 +--
sys-cluster/galera/galera-25.3.17.ebuild | 87 ++++++++++++++++++++++++++++++++
4 files changed, 94 insertions(+), 3 deletions(-)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 8ff186d..c6394d9 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1 +1,2 @@
DIST galera-3-25.3.15.tar.gz 2994995 SHA256 0de1c1c8304e7f1dfa43ef2a2b15c8ca724556d5b187c31c8a93c755737163af SHA512 717c431d29653cba3252dae5a845e82c02e4cb122a6477253e68688600bf130a753f89f94b7b2461695ede9033ca0107324831d2c5b7d2d0479a0936d2779e84 WHIRLPOOL e0fa0de7e0a75563f78feec488fda64bc4ec9cc97a369e18fbf3c817c520a8a5e3118a4c95f14cf987f019f4f9c96f86df32c4b87c66ec7750c401e0017daf76
+DIST galera-3-25.3.17.tar.gz 2999905 SHA256 521d97dd4618ec3e889756527144e12eb99a95f852a83d13afca57986a4a575a SHA512 b54985a74ed4c4d21c368c56a8442961648670eef18f03f2813a9fac34972532ea2f6c79997945de1c9dd1b4dfd5b862a38c052ef6e0d94bd5c85e05e042e61f WHIRLPOOL b755a9f33747c079a4fc47cddd8993c46fd422139f4c5e5de92be146ee09a2f38b07b02e5250a9b726cabec6c4194b593aa8407d6ef37cd6f7aeb04a036ea155
diff --git a/sys-cluster/galera/files/garb.cnf b/sys-cluster/galera/files/garb.cnf
index 4f0047a..63b79c1 100644
--- a/sys-cluster/galera/files/garb.cnf
+++ b/sys-cluster/galera/files/garb.cnf
@@ -7,6 +7,9 @@
# Galera cluster name, should be the same as on the rest of the nodes.
# GALERA_GROUP=""
+# Arbitrator node name, give a specific name to this node in cluster.
+# NODE_NAME=""
+
# Optional Galera internal options string (e.g. SSL settings)
# see http://www.codership.com/wiki/doku.php?id=galera_parameters
# GALERA_OPTIONS=""
diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
index da7d550..f03eaff 100644
--- a/sys-cluster/galera/files/garb.sh
+++ b/sys-cluster/galera/files/garb.sh
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
depend() {
@@ -24,7 +24,8 @@ start() {
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 "${LOG_FILE}" ] && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
+ [ -n "${NODE_NAME}" ] && OPTIONS="${OPTIONS} -n ${NODE_NAME}"
start-stop-daemon \
--start \
@@ -46,4 +47,3 @@ stop() {
--pidfile "${PIDFILE}"
eend $?
}
-
diff --git a/sys-cluster/galera/galera-25.3.17.ebuild b/sys-cluster/galera/galera-25.3.17.ebuild
new file mode 100644
index 0000000..f3b2b29
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.17.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_P="${PN}-3-${PV}"
+
+inherit scons-utils toolchain-funcs user flag-o-matic
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://www.galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+
+CDEPEND="
+ dev-libs/openssl:0=
+ >=dev-libs/boost-1.41:0=
+ "
+DEPEND="${DEPEND}
+ ${CDEPEND}
+ dev-libs/check
+ >=sys-devel/gcc-4.4
+ >=dev-cpp/asio-1.10.1[ssl]
+ "
+#Run time only
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+# Respect {C,LD}FLAGS.
+PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
+
+pkg_preinst() {
+ if use garbd ; then
+ enewgroup garbd
+ enewuser garbd -1 -1 -1 garbd
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Remove bundled dev-cpp/asio
+ rm -r "${S}/asio" || die
+
+ #Remove optional garbd daemon
+ if ! use garbd ; then
+ rm -r "${S}/garb" || die
+ fi
+}
+
+src_configure() {
+ tc-export 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
+ else
+ append-cflags -DCRC32C_NO_HARDWARE
+ fi
+ # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+ # and -Wold-style-cast
+ MYSCONS=(
+ ssl=1
+ tests=$(usex test 1 0)
+ strict_build_flags=0
+ )
+}
+
+src_compile() {
+ escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+ dodoc scripts/packages/README scripts/packages/README-MySQL
+ if use garbd ; then
+ dobin garb/garbd
+ newconfd "${FILESDIR}/garb.cnf" garbd
+ newinitd "${FILESDIR}/garb.sh" garbd
+ doman man/garbd.8
+ fi
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe libgalera_smm.so
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2020-09-11 11:53 Thomas Deutschmann
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2020-09-11 11:53 UTC (permalink / raw
To: gentoo-commits
commit: cb511555ca37e2ae023f4de885508d4c9ef73450
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 11:49:54 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 11:52:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb511555
sys-cluster/galera: don't call objdump directly
Closes: https://bugs.gentoo.org/729026
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../files/galera-26.4.5-respect-toolchain.patch | 55 ++++++++++++++++++++++
sys-cluster/galera/galera-26.4.5.ebuild | 4 +-
2 files changed, 57 insertions(+), 2 deletions(-)
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 00000000000..c82c870b4f3
--- /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 760070fc8af..9cdd6baf8cd 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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2020-10-29 16:49 Thomas Deutschmann
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2020-10-29 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 5ca6d59b0063b7e8f8fabe8772d81c99a59a18ff
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 13:13:32 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 16:46:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca6d59b
sys-cluster/galera: bump to v26.4.6
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-cluster/galera/Manifest | 1 +
| 38 ++++++++++
sys-cluster/galera/galera-26.4.6.ebuild | 88 ++++++++++++++++++++++
3 files changed, 127 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index c2349925463..8bc9a834075 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -5,3 +5,4 @@ DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d3
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
--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
new file mode 100644
index 00000000000..5f5be7a7a94
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch
@@ -0,0 +1,38 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -89,7 +89,7 @@ Commandline Options:
+ build_target = 'all'
+
+ # Optimization level
+-opt_flags = ' -g -O3 -DNDEBUG'
++opt_flags = ' -DNDEBUG'
+
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -134,26 +134,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))
diff --git a/sys-cluster/galera/galera-26.4.6.ebuild b/sys-cluster/galera/galera-26.4.6.ebuild
new file mode 100644
index 00000000000..90fb8616cae
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+MY_P="${PN}-4-${PV}"
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="https://galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/galera-4/source/${MY_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]
+ <dev-cpp/asio-1.12.0
+ "
+#Run time only
+RDEPEND="${CDEPEND}"
+
+# Respect {C,LD}FLAGS.
+PATCHES=(
+ "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
+ "${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ # Remove bundled dev-cpp/asio
+ rm -r "${S}/asio" || die
+
+ #Remove optional garbd daemon
+ if ! use garbd ; then
+ rm -r "${S}/garb" || die
+ fi
+}
+
+src_configure() {
+ 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
+ else
+ append-cflags -DCRC32C_NO_HARDWARE
+ fi
+ # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+ # and -Wold-style-cast
+ MYSCONS=(
+ tests=$(usex test 1 0)
+ strict_build_flags=0
+ system_asio=1
+ )
+}
+
+src_compile() {
+ escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+ dodoc scripts/packages/README scripts/packages/README-MySQL
+ if use garbd ; then
+ dobin garb/garbd
+ newconfd "${FILESDIR}/garb.cnf" garbd
+ newinitd "${FILESDIR}/garb.init" garbd
+ doman man/garbd.8
+ fi
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe libgalera_smm.so
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2022-01-01 10:48 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2022-01-01 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 390112c10222dcd5bdb5724c225ee99d11ffd7b0
Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Sat Dec 18 06:40:44 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 10:48:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390112c1
sys-cluster/galera: drop old ebuilds and patches
leave behind galera-25 because of mariadb
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
sys-cluster/galera/Manifest | 3 -
.../files/galera-26.4.5-respect-toolchain.patch | 55 -------------
| 78 -------------------
sys-cluster/galera/galera-26.4.6-r1.ebuild | 88 ---------------------
sys-cluster/galera/galera-26.4.7-r1.ebuild | 85 ---------------------
sys-cluster/galera/galera-26.4.9-r1.ebuild | 89 ----------------------
6 files changed, 398 deletions(-)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 1fbb7b7efc17..fc10b6bc9caa 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,7 +1,4 @@
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.10.tar.gz 1424663 BLAKE2B 6be96cfaffd0af14a511f1f1aeaf2b7c18a3aa05216389e51a90834d9307bcd832005ee5da38acf530d40b2b6c11e62353be5aa4c0f678804808d1f74bbeea38 SHA512 97fd629d9f963459a9bce377ebcd35a5b4f533451f38011a03e440f0ac3ceddcaf45f4001afa8cd523626c03e64f27363e4b2e819d2b637551e579a3add44226
-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-26.4.9.tar.gz 1422801 BLAKE2B 45840fd73083c292ca7b2f491dafdf9134066f66bee85e10d6be72a428272dbe8773bf8d7ba52793cbc63c388e59d900e2e7a7c861266d11a5d07640552cb42d SHA512 c089d76ec72c2b3ad8814119f24b0f46e562d469a029b43bffc5b25dc73334f23fd016084f69f4fe42152402db8e03528371e2fa9802c9fa39d4112300aa163d
-DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
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
deleted file mode 100644
index c82c870b4f39..000000000000
--- a/sys-cluster/galera/files/galera-26.4.5-respect-toolchain.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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/files/galera-4.1-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
deleted file mode 100644
index dfa1642c7d7e..000000000000
--- a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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))
diff --git a/sys-cluster/galera/galera-26.4.6-r1.ebuild b/sys-cluster/galera/galera-26.4.6-r1.ebuild
deleted file mode 100644
index 23c60542ac9a..000000000000
--- a/sys-cluster/galera/galera-26.4.6-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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 toolchain-funcs flag-o-matic
-
-MY_P="${PN}-4-${PV}"
-
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="https://galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/galera-4/source/${MY_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(+)]
- <dev-cpp/asio-1.12.0
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=(
- "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
- "${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- 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
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-26.4.7-r1.ebuild b/sys-cluster/galera/galera-26.4.7-r1.ebuild
deleted file mode 100644
index 4da1ee14e942..000000000000
--- a/sys-cluster/galera/galera-26.4.7-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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 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-4/source/galera-4-${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(+)]
- <dev-cpp/asio-1.12.0
- "
-
-#Run time only
-RDEPEND="${CDEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=(
- "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
- "${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch
-)
-
-S="${WORKDIR}/galera-4-${PV}"
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export AR CC CXX OBJDUMP
-
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-26.4.9-r1.ebuild b/sys-cluster/galera/galera-26.4.9-r1.ebuild
deleted file mode 100644
index 8c2638ef5bb9..000000000000
--- a/sys-cluster/galera/galera-26.4.9-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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 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-4/source/galera-4-${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"
-
-# Tests are currently broken, see
-# - https://github.com/codership/galera/issues/595
-# - https://github.com/codership/galera/issues/596
-RESTRICT="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(+)]
- <dev-cpp/asio-1.12.0
- "
-
-#Run time only
-RDEPEND="${CDEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=(
- "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
- "${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
-)
-
-S="${WORKDIR}/galera-4-${PV}"
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export AR CC CXX OBJDUMP
-
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2022-12-14 3:52 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-12-14 3:52 UTC (permalink / raw
To: gentoo-commits
commit: 860bf61eb3406a2d6542b315c8b5d51595827693
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Dec 9 19:17:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 03:52:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860bf61e
sys-cluster/galera: update to 26.4.13
Galera updated to ASIO 1.22.1:
https://github.com/codership/galera/commit/60d5e4c6b4c65dd9da54078bddd8e198cd1de048
However, later they downgraded to 1.14.1:
https://github.com/codership/galera/commit/f90cad156bbe5f377c95a7a3c5ca87546664f569
"Asio versions higher or equal than 1.16.1 require
OpenSSL 1.0.2 or higher. However, some old platforms still in use
have older OpenSSL libraries."
However SConstruct wasn't updated.
https://github.com/codership/galera/issues/631
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28620
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/galera/Manifest | 1 +
sys-cluster/galera/files/galera-26.4.13-asio.patch | 22 ++++++
.../galera/files/galera-26.4.13-tests.patch | 13 ++++
sys-cluster/galera/galera-26.4.13.ebuild | 85 ++++++++++++++++++++++
4 files changed, 121 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 301935fd7c7f..d72a32632e3d 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -3,4 +3,5 @@ DIST galera-25.3.35.tar.gz 1278869 BLAKE2B c5c0cc1d4ad29caf94550a6b96ab9762a9727
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.12.tar.gz 1433269 BLAKE2B f65d1633e2ac5fbb9b2bbd83b9e98741f083e4a5759a74721bb564b6d5987cfc4db2c762aadd0155abe20a4faee6c3f8f25eaed38ad8c4338744990075cad4a1 SHA512 158fc3c367623fbdd7a81b1a391efc9893983805b5673e0b22bc74ad581a68a8789d388e8d98cb2880f1cd15d95d39ee4ce133ad9fc934209e74177fecf6a100
+DIST galera-26.4.13.tar.gz 1529682 BLAKE2B d7030fd5e3a48ede16f608cca9986de117a54f99cf3d972a5b14623acd84f05f31f5cdbbc3032bf5caa8e0486f418ac07c8f87287bb14a8164507c558876ae61 SHA512 e548048eac5fceb0bea1ae736abc6c488d175bc71a3cfb963675232688392ecb5dcc64ddd8e78ceda40e26b94b806d3c34bd9fc9765ebc047b5a5ce28ff7efea
DIST galera-26.4.8.tar.gz 1423256 BLAKE2B 9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4 SHA512 5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661
diff --git a/sys-cluster/galera/files/galera-26.4.13-asio.patch b/sys-cluster/galera/files/galera-26.4.13-asio.patch
new file mode 100644
index 000000000000..5f20ec1624e2
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.13-asio.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..21b1b72f0058
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.13-tests.patch
@@ -0,0 +1,13 @@
+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/galera-26.4.13.ebuild b/sys-cluster/galera/galera-26.4.13.ebuild
new file mode 100644
index 000000000000..7f5f54e4404b
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.13.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 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
+
+MY_PN="${PN}-4"
+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-1.41:0=
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/check
+ >=dev-cpp/asio-1.22
+"
+
+#Run time only
+RDEPEND="${COMMON_DEPEND}"
+
+# Respect {C,LD}FLAGS.
+PATCHES=(
+ "${FILESDIR}/${PN}"-26.4.6-strip-extra-cflags.patch
+ "${FILESDIR}/${PN}"-26.4.8-respect-toolchain.patch
+ "${FILESDIR}/${PN}"-26.4.13-asio.patch
+ "${FILESDIR}/${PN}"-26.4.13-tests.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ # Remove bundled dev-cpp/asio
+ rm -r "${S}/asio" || die "Failed to remove bundled asio"
+ #Remove optional garbd daemon
+ if ! use garbd ; then
+ rm -r "${S}/garb" || die "Failed to remove garbd daemon"
+ fi
+}
+
+src_configure() {
+ tc-export AR CC CXX OBJDUMP
+ # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+ # and -Wold-style-cast
+ MYSCONS=(
+ crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
+ tests=$(usex test 1 0)
+ strict_build_flags=0
+ system_asio=1
+ )
+}
+
+src_compile() {
+ escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+ dodoc scripts/packages/README scripts/packages/README-MySQL
+ if use garbd ; then
+ dobin garb/garbd
+ newconfd "${FILESDIR}/garb.cnf" garbd
+ newinitd "${FILESDIR}/garb.init" garbd
+ doman man/garbd.8
+ fi
+ exeinto /usr/$(get_libdir)/"${PN}"
+ doexe libgalera_smm.so
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2023-01-02 22:02 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2023-01-02 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 7cb32b75416d89ad1a11cabfbdca1c95b9031555
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 2 22:01:34 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 2 22:01:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb32b75
sys-cluster/galera: drop versions
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-cluster/galera/Manifest | 5 --
.../files/galera-25.3.32-respect-cflags.patch | 38 ---------
| 78 -------------------
sys-cluster/galera/galera-25.3.28-r2.ebuild | 81 --------------------
sys-cluster/galera/galera-25.3.35.ebuild | 80 -------------------
sys-cluster/galera/galera-25.3.37.ebuild | 80 -------------------
sys-cluster/galera/galera-26.4.12.ebuild | 87 ---------------------
sys-cluster/galera/galera-26.4.8-r1.ebuild | 89 ----------------------
8 files changed, 538 deletions(-)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index d72a32632e3d..25285a706ebd 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,7 +1,2 @@
-DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611 SHA512 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
-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.12.tar.gz 1433269 BLAKE2B f65d1633e2ac5fbb9b2bbd83b9e98741f083e4a5759a74721bb564b6d5987cfc4db2c762aadd0155abe20a4faee6c3f8f25eaed38ad8c4338744990075cad4a1 SHA512 158fc3c367623fbdd7a81b1a391efc9893983805b5673e0b22bc74ad581a68a8789d388e8d98cb2880f1cd15d95d39ee4ce133ad9fc934209e74177fecf6a100
DIST galera-26.4.13.tar.gz 1529682 BLAKE2B d7030fd5e3a48ede16f608cca9986de117a54f99cf3d972a5b14623acd84f05f31f5cdbbc3032bf5caa8e0486f418ac07c8f87287bb14a8164507c558876ae61 SHA512 e548048eac5fceb0bea1ae736abc6c488d175bc71a3cfb963675232688392ecb5dcc64ddd8e78ceda40e26b94b806d3c34bd9fc9765ebc047b5a5ce28ff7efea
-DIST galera-26.4.8.tar.gz 1423256 BLAKE2B 9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4 SHA512 5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661
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
deleted file mode 100644
index 94c1f829450a..000000000000
--- a/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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/files/galera-4.1-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
deleted file mode 100644
index dfa1642c7d7e..000000000000
--- a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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))
diff --git a/sys-cluster/galera/galera-25.3.28-r2.ebuild b/sys-cluster/galera/galera-25.3.28-r2.ebuild
deleted file mode 100644
index eb95bef3291d..000000000000
--- a/sys-cluster/galera/galera-25.3.28-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 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
-
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="https://galeracluster.com"
-SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/${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"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-libs/openssl:0=
- dev-libs/boost:=
- "
-BDEPEND=">=sys-devel/gcc-4.4"
-DEPEND="${BDEPEND}
- ${CDEPEND}
- dev-libs/check
- >=dev-cpp/asio-1.10.1[ssl(+)]
- <dev-cpp/asio-1.12.0
- "
-#Run time only
-RDEPEND="${CDEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export 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
- else
- append-cflags -DCRC32C_NO_HARDWARE
- fi
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.35.ebuild b/sys-cluster/galera/galera-25.3.35.ebuild
deleted file mode 100644
index cec35cd930c9..000000000000
--- a/sys-cluster/galera/galera-25.3.35.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 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(+)]
- <dev-cpp/asio-1.12.0
-"
-
-#Run time only
-RDEPEND="${COMMON_DEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/${PN}"-25.3.32-respect-cflags.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die "Failed to remove bundled asio"
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die "Failed to remove garbd daemon"
- fi
-}
-
-src_configure() {
- tc-export AR CC CXX OBJDUMP
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/"${PN}"
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.37.ebuild b/sys-cluster/galera/galera-25.3.37.ebuild
deleted file mode 100644
index 16f503054922..000000000000
--- a/sys-cluster/galera/galera-25.3.37.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 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-1.41:0=
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- dev-libs/check
- >=dev-cpp/asio-1.10.1[ssl(+)]
- <dev-cpp/asio-1.12.0
-"
-
-#Run time only
-RDEPEND="${COMMON_DEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/${PN}"-25.3.32-respect-cflags.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die "Failed to remove bundled asio"
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die "Failed to remove garbd daemon"
- fi
-}
-
-src_configure() {
- tc-export AR CC CXX OBJDUMP
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/"${PN}"
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-26.4.12.ebuild b/sys-cluster/galera/galera-26.4.12.ebuild
deleted file mode 100644
index fcede7c434f9..000000000000
--- a/sys-cluster/galera/galera-26.4.12.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 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}-4"
-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"
-
-# Tests are currently broken, see
-# - https://github.com/codership/galera/issues/595
-# - https://github.com/codership/galera/issues/596
-RESTRICT="test"
-
-COMMON_DEPEND="
- dev-libs/openssl:0=
- >=dev-libs/boost-1.41:0=
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- dev-libs/check
- >=dev-cpp/asio-1.10.1[ssl(+)]
- <dev-cpp/asio-1.12.0
-"
-
-#Run time only
-RDEPEND="${COMMON_DEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=(
- "${FILESDIR}/${PN}"-26.4.6-strip-extra-cflags.patch
- "${FILESDIR}/${PN}"-26.4.8-respect-toolchain.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die "Failed to remove bundled asio"
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die "Failed to remove garbd daemon"
- fi
-}
-
-src_configure() {
- tc-export AR CC CXX OBJDUMP
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/"${PN}"
- doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-26.4.8-r1.ebuild b/sys-cluster/galera/galera-26.4.8-r1.ebuild
deleted file mode 100644
index f071a52b10e0..000000000000
--- a/sys-cluster/galera/galera-26.4.8-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 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
-
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="https://galeracluster.com"
-SRC_URI="https://releases.galeracluster.com/galera-4/source/galera-4-${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"
-
-# Tests are currently broken, see
-# - https://github.com/codership/galera/issues/595
-# - https://github.com/codership/galera/issues/596
-RESTRICT="test"
-
-CDEPEND="
- dev-libs/openssl:0=
- dev-libs/boost:=
- "
-
-BDEPEND=">=sys-devel/gcc-4.4"
-
-DEPEND="${BDEPEND}
- ${CDEPEND}
- dev-libs/check
- >=dev-cpp/asio-1.10.1[ssl(+)]
- <dev-cpp/asio-1.12.0
- "
-
-#Run time only
-RDEPEND="${CDEPEND}"
-
-# Respect {C,LD}FLAGS.
-PATCHES=(
- "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
- "${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
-)
-
-S="${WORKDIR}/galera-4-${PV}"
-
-src_prepare() {
- default
-
- # Remove bundled dev-cpp/asio
- rm -r "${S}/asio" || die
-
- #Remove optional garbd daemon
- if ! use garbd ; then
- rm -r "${S}/garb" || die
- fi
-}
-
-src_configure() {
- tc-export AR CC CXX OBJDUMP
-
- # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
- # and -Wold-style-cast
- MYSCONS=(
- crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
- tests=$(usex test 1 0)
- strict_build_flags=0
- system_asio=1
- )
-}
-
-src_compile() {
- escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
- dodoc scripts/packages/README scripts/packages/README-MySQL
- if use garbd ; then
- dobin garb/garbd
- newconfd "${FILESDIR}/garb.cnf" garbd
- newinitd "${FILESDIR}/garb.init" garbd
- doman man/garbd.8
- fi
- exeinto /usr/$(get_libdir)/${PN}
- doexe libgalera_smm.so
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-01-02 22:02 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-18 20:37 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/, sys-cluster/galera/files/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2015-09-15 14:01 Brian Evans
2015-11-20 21:14 Brian Evans
2016-03-18 14:30 Brian Evans
2016-03-18 14:30 Brian Evans
2016-08-11 19:04 Brian Evans
2020-09-11 11:53 Thomas Deutschmann
2020-10-29 16:49 Thomas Deutschmann
2022-01-01 10:48 Ulrich Müller
2022-12-14 3:52 Sam James
2023-01-02 22:02 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox