[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/

[Sam James]

commit:     bc1f18f8e905115fb9a1dfba7bd7915de9677d96
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 22:47:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 12 22:48:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1f18f8

sys-cluster/galera: restore galera-4.1-strip-extra-cflags.patch

Needed by galera-25.3.28-r2 still.

Fixes: 390112c10222dcd5bdb5724c225ee99d11ffd7b0
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/galera-4.1-strip-extra-cflags.patch      | 78 ++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
new file mode 100644
index 000000000000..dfa1642c7d7e
--- /dev/null
+++ b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
@@ -0,0 +1,78 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript	2019-02-25 10:37:25.000000000 -0500
++++ b/galerautils/src/SConscript	2019-03-07 09:51:27.163226469 -0500
+@@ -1,4 +1,4 @@
+-Import('env', 'x86', 'sysname', 'machine')
++Import('env', 'sysname', 'machine')
+ 
+ libgalerautils_env = env.Clone()
+ 
+@@ -39,22 +39,6 @@
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
+ 
+-if x86:
+-    if machine != 'ppc64' and machine != 'ppc64le':
+-        crc32c_env.Append(CFLAGS = ' -msse4.2')
+-    if sysname == 'sunos':
+-        # Ideally we want to simply strip SSE4.2 flag from the resulting
+-        # crc32.pic.o
+-        # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
+-        # but that requires some serious scons-fu, so we just don't
+-        # compile hardware support in if host CPU does not have it.
+-        from subprocess import check_call
+-        try:
+-            check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
+-        except:
+-            libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-            crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+                                  libgalerautils_objs + crc32c_objs)
+ 
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct	2019-03-07 09:44:38.588841625 -0500
++++ b/SConstruct	2019-03-07 09:50:06.305952407 -0500
+@@ -67,7 +67,7 @@
+ build_target = 'all'
+ 
+ # Optimization level
+-opt_flags    = ' -g -O3 -DNDEBUG'
++opt_flags    = ' -DNDEBUG'
+ 
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -120,33 +120,6 @@
+ if gcov:
+     opt_flags = opt_flags + ' --coverage -g'
+ 
+-if sysname == 'sunos':
+-    compile_arch = ' -mtune=native'
+-elif x86:
+-    if bits == 32:
+-        if machine == 'x86_64':
+-            compile_arch = ' -mx32'
+-        else:
+-            compile_arch = ' -m32 -march=i686'
+-            if sysname == 'linux':
+-                link_arch = ' -Wl,-melf_i386'
+-    else:
+-        if machine == 'ppc64':
+-          compile_arch = ' -mtune=native'
+-          link_arch = ' -Wl,-melf64ppc'
+-        elif machine == 'ppc64le':
+-          compile_arch = ' -mtune=native'
+-          link_arch = ' -Wl,-melf64lppc'
+-        else:
+-          compile_arch = ' -m64'
+-          if sysname == 'linux':
+-            link_arch = ' -Wl,-melf_x86_64'
+-        link_arch = compile_arch + link_arch
+-elif machine == 's390x':
+-    compile_arch = ' -mzarch'
+-    if bits == 32:
+-        compile_arch += ' -m32'
+-
+ boost      = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
+ system_asio= int(ARGUMENTS.get('system_asio', 1))

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/

[Thomas Deutschmann]

commit:     1669e78dac9488bac809b6207d1a95151efada7c
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Feb  4 17:56:06 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 22:28:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1669e78d

sys-cluster/galera: remove unused patches

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19326
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../galera/files/galera-26.4.4-respect-AR.patch    | 12 ----
 .../files/galera-26.4.5-strip-extra-cflags.patch   | 68 ----------------------
 sys-cluster/galera/files/garb.sh                   | 49 ----------------
 3 files changed, 129 deletions(-)

diff --git a/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch b/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch
deleted file mode 100644
index 972bb9288a6..00000000000
--- a/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -213,6 +213,9 @@ if cxx != 'default':
- link = os.getenv('LINK', 'default')
- if link != 'default':
-     env.Replace(LINK = link)
-+ar = os.getenv('AR', 'default')
-+if ar != 'default':
-+    env.Replace(AR = ar)
-
- # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc
- cc_version = str(read_first_line(env['CC'].split() + ['--version']))

diff --git a/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
deleted file mode 100644
index ac99140b6c9..00000000000
--- a/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -87,7 +87,7 @@ Commandline Options:
- build_target = 'all'
- 
- # Optimization level
--opt_flags    = ' -g -O3 -DNDEBUG'
-+opt_flags    = ' -DNDEBUG'
- 
- # Architecture (defaults to build host type)
- compile_arch = ''
-@@ -133,26 +133,6 @@ if dbug:
- if gcov:
-     opt_flags = opt_flags + ' --coverage -g'
- 
--if sysname == 'sunos':
--    compile_arch = ' -mtune=native'
--elif x86:
--    if bits == 32:
--        if machine == 'x86_64':
--            compile_arch = ' -mx32'
--        else:
--            compile_arch = ' -m32 -march=i686'
--            if sysname == 'linux':
--                link_arch = ' -Wl,-melf_i386'
--    else:
--        compile_arch = ' -m64'
--        if sysname == 'linux':
--            link_arch = ' -Wl,-melf_x86_64'
--    link_arch = compile_arch + link_arch
--elif machine == 's390x':
--    compile_arch = ' -mzarch'
--    if bits == 32:
--        compile_arch += ' -m32'
--
- boost      = int(ARGUMENTS.get('boost', 1))
- boost_pool = int(ARGUMENTS.get('boost_pool', 0))
- system_asio= int(ARGUMENTS.get('system_asio', 1))
---- a/galerautils/src/SConscript
-+++ b/galerautils/src/SConscript
-@@ -1,4 +1,4 @@
--Import('env', 'x86', 'sysname')
-+Import('env', 'sysname')
- 
- libgalerautils_env = env.Clone()
- 
-@@ -39,21 +39,6 @@ crc32c_env.Append(CPPFLAGS = ' -DWITH_GALERA')
- crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
- crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
- 
--if x86:
--    crc32c_env.Append(CFLAGS = ' -msse4.2')
--    if sysname == 'sunos':
--        # Ideally we want to simply strip SSE4.2 flag from the resulting
--        # crc32.pic.o
--        # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
--        # but that requires some serious scons-fu, so we just don't
--        # compile hardware support in if host CPU does not have it.
--        from subprocess import check_call
--        try:
--            check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
--        except:
--            libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
--            crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
--
- libgalerautils_env.StaticLibrary('galerautils',
-                                  libgalerautils_objs + crc32c_objs)
- 

diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
deleted file mode 100644
index f03eaffc076..00000000000
--- a/sys-cluster/galera/files/garb.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	after mysql
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -z "${GALERA_NODES}" ]; then
-		eerror "List of GALERA_NODES is not configured"
-		return 1
-	fi
-
-	if [ -z "${GALERA_GROUP}" ]; then
-		eerror "GALERA_GROUP name is not configured"
-		return 1
-	fi
-
-	GALERA_PORT="${GALERA_PORT:-4567}"
-
-	OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}"
-	[ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
-	[ -n "${LOG_FILE}" ]       && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
-	[ -n "${NODE_NAME}" ]      && OPTIONS="${OPTIONS} -n ${NODE_NAME}"
-
-	start-stop-daemon \
-		--start \
-		--exec /usr/bin/garbd \
-		--pidfile "${PIDFILE}" \
-		--make-pidfile \
-		--user garbd \
-		--group garbd \
-		--background \
-		-- ${OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon \
-		--stop \
-		--exec /usr/bin/garbd \
-		--pidfile "${PIDFILE}"
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/files/

[Brian Evans]

commit:     9acf8d40e07c401b26eec8f7b04d98bd7d455d48
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 18:59:52 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 18:59:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acf8d40

sys-cluster/galera: Remove bashism from init script

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 sys-cluster/galera/files/garb.init | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/galera/files/garb.init b/sys-cluster/galera/files/garb.init
index 5bf57a7a683..6da7a758228 100644
--- a/sys-cluster/galera/files/garb.init
+++ b/sys-cluster/galera/files/garb.init
@@ -26,7 +26,8 @@ start_pre() {
 
 	GALERA_PORT=${GALERA_PORT:-4567}
 
-	local OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}"
+	local nodes=$(echo "${GALERA_NODES}" | awk '{ gsub(" ", ",") ; print $0 }')
+	local OPTIONS="-a gcomm://${nodes} -g ${GALERA_GROUP}"
 	[ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
 	[ -n "${LOG_FILE}" ]       && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
 	[ -n "${NODE_NAME}" ]      && OPTIONS="${OPTIONS} -n ${NODE_NAME}"