* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/, dev-db/percona-xtrabackup/
@ 2018-05-04 14:40 Thomas Deutschmann
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2018-05-04 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 75127cd12bb23cca25c5ee46a016b0d8592e6d05
Author: Tomas Mozes <tmozes <AT> sygic <DOT> com>
AuthorDate: Wed May 2 12:42:26 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri May 4 14:16:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75127cd1
dev-db/percona-xtrabackup: bump to 2.4.11
Package-Manager: Portage-2.3.31, Repoman-2.3.9
dev-db/percona-xtrabackup/Manifest | 1 +
...ercona-xtrabackup-2.4.11-fix-gcc6-isystem.patch | 113 +++++++++++++++++++++
.../percona-xtrabackup-2.4.11.ebuild | 86 ++++++++++++++++
3 files changed, 200 insertions(+)
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index a28256c1118..41fd3c82675 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,4 +1,5 @@
DIST percona-xtrabackup-2.4.10.tar.gz 59217573 BLAKE2B 3a4485b6d8c5b9ad2ca4b60603383b18ec0a3da7e4cca3b5a1ee2d24b6ca17844cc406123bbaf9313fc17570db0168c13af16d17404e075fc8140731ef9b79c2 SHA512 a4ebbebabc8b9b5fec9777fc3569c530b4a88a1b75d3e78d2edf7627a2e8cadf7aa2d8988963136b331a274c80371ff9b7fafcc7d8a129f446eb58777ce1764f
+DIST percona-xtrabackup-2.4.11.tar.gz 59267058 BLAKE2B 1de9905a2c191a58290e87a90e36c263f66935ce0846af205e1a0accc6e9b2938dd8679f65acc4b51ca956f2bcbca831cd10c9d50c01c2ecfd9d059fde500e20 SHA512 2fa4757fe944fb4c8113dca1fa25beaa23de5d5f9fc830b36a6d9eb4efb7e7fb1eec10f91be5e91fd3b7980bc157832ed52c9da59a342f6aae05ceae8ecdf760
DIST percona-xtrabackup-2.4.7.tar.gz 54119422 BLAKE2B 41ae661efe53e0ede92dc1e1555e05f68c2fd2848d32c5ae9df3244a5b3e9d996c23cd3b9b79e5a0630140ea02e04f3560679b4c493484e7c2a1b0bcc5847aa0 SHA512 7aaf82975cd4c0b7af119902eddf96b8ce75c0fbcbd6835991e33f1f89347361fbe3c9040762c9989df5d53199b628aa6b2b45004ef440bb46e2415fbab13009
DIST percona-xtrabackup-2.4.8.tar.gz 57965576 BLAKE2B 5cca947549181413ef68bcc7a5fd935404ebf2aaccc2e8de42221cbc0007371ca3499e26f2ab312b7fb94fe74a7079c48a11405df18cc3c809329403a83840cd SHA512 a613c41169c6ebdba27c6cb8111d388ff656d4daf0e69b52e401b293a6ac6499d81d0f028afd805fa60018ad5f2007e70db7a9ba931d6829272f0ce273ba9739
DIST percona-xtrabackup-2.4.9.tar.gz 58001052 BLAKE2B d2a25a5ca2190ccf82a600245a0e21848abd9a33ea937a81b2ba9c7e518b24291080a3d3c4b8e6d02f51523e5cf2e78680e4b351c4f2bcd8f122c58f62c14418 SHA512 913431f0fa648731efa2e9bc87c9431a28816b0eca12e1c6df6e7ab04a4148ddd8fa03c9792335ad152b05bede5b9fe64ce94a393b5e4e37d4b18f4989b0ccdb
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch
new file mode 100644
index 00000000000..4fed659cdae
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch
@@ -0,0 +1,113 @@
+Do not use -isystem to add headers, as they break GCC 6's header wrapping.
+See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
+
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index dbf1c48..e5d7347 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -52,7 +52,7 @@ IF(NOT WITHOUT_SERVER)
+ upgrade/program.cc
+ )
+ ADD_COMPILE_FLAGS(
+- upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+ TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
+diff --git a/client/base/CMakeLists.txt b/client/base/CMakeLists.txt
+index b206de7..91cce4c 100644
+--- a/client/base/CMakeLists.txt
++++ b/client/base/CMakeLists.txt
+@@ -49,7 +49,7 @@ ADD_COMPILE_FLAGS(
+ mutex.cc
+ mysql_query_runner.cc
+ show_variable_query_extractor.cc
+- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+
+ TARGET_LINK_LIBRARIES(client_base mysqlclient)
+diff --git a/client/dump/CMakeLists.txt b/client/dump/CMakeLists.txt
+index fdbb631..bae2ce7 100644
+--- a/client/dump/CMakeLists.txt
++++ b/client/dump/CMakeLists.txt
+@@ -50,7 +50,7 @@ IF(USING_LOCAL_BOOST)
+
+ ADD_COMPILE_FLAGS(
+ ${BOOST_LIB_SOURCES}
+- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+
+ IF(HAVE_clock_gettime_IN_rt)
+@@ -145,7 +145,7 @@ TARGET_LINK_LIBRARIES(mysqlpump_lib
+
+ ADD_COMPILE_FLAGS(
+ ${MYSQLPUMP_LIB_SOURCES}
+- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+
+ # Files that use Boost sources that trigger compilation warnings
+@@ -179,7 +179,7 @@ ADD_COMPILE_FLAGS(
+ )
+ MYSQL_ADD_EXECUTABLE(mysqlpump program.cc)
+ ADD_COMPILE_FLAGS(
+- program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+
+ TARGET_LINK_LIBRARIES(mysqlpump mysqlpump_lib ${LOCAL_BOOST_LIB})
+diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
+index 44c1d26..dac03d9 100644
+--- a/libmysqld/CMakeLists.txt
++++ b/libmysqld/CMakeLists.txt
+@@ -123,7 +123,7 @@ ADD_COMPILE_FLAGS(
+ ../sql/item_geofunc_setops.cc
+ ../sql/item_json_func.cc
+ ../sql/spatial.cc
+- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+
+ ADD_COMPILE_FLAGS(
+diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
+index 1d1231f..9a35fa8 100644
+--- a/sql/CMakeLists.txt
++++ b/sql/CMakeLists.txt
+@@ -312,7 +312,7 @@ ADD_COMPILE_FLAGS(
+ item_geofunc_setops.cc
+ item_json_func.cc
+ spatial.cc
+- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+
+ ADD_COMPILE_FLAGS(
+diff --git a/unittest/gunit/CMakeLists.txt b/unittest/gunit/CMakeLists.txt
+index f0123b8..f2169f9 100644
+--- a/unittest/gunit/CMakeLists.txt
++++ b/unittest/gunit/CMakeLists.txt
+@@ -385,7 +385,7 @@ IF (MERGE_UNITTESTS)
+ ENDIF()
+ ADD_COMPILE_FLAGS(
+ ${MERGE_SMALL_TESTS}
+- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+ # Fixes "C1128: number of sections exceeded object file format limit" in MSVC
+ IF(WIN32)
+@@ -467,11 +467,11 @@ ENDIF(MERGE_UNITTESTS)
+ ENDIF()
+ ADD_COMPILE_FLAGS(
+ bounded_queue-t.cc
+- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+ ADD_COMPILE_FLAGS(
+ pump_object_filter-t.cc
+- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+ )
+
+ FOREACH(test ${SERVER_TESTS})
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.11.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.11.ebuild
new file mode 100644
index 00000000000..8842c1a74b7
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.11.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ app-arch/lz4:0=
+ app-editors/vim-core
+ <dev-libs/boost-1.65.0:=
+ dev-libs/libaio
+ <dev-libs/libedit-20170329.3.1
+ dev-libs/libev
+ dev-libs/libevent:0=
+ dev-libs/libgcrypt:0=
+ dev-libs/libgpg-error
+ dev-python/sphinx
+ net-misc/curl
+ sys-libs/zlib:="
+
+RDEPEND="
+ ${DEPEND}
+ !dev-db/xtrabackup-bin
+ dev-perl/DBD-mysql"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
+ "${FILESDIR}"/${PN}-2.4.11-fix-gcc6-isystem.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # remove bundled boost, libedit, libevent, zlib
+ # just to be safe...
+ # We keep lz4 directory because we use extra/lz4/xxhash.c in cmake/libutils.cmake
+ rm -rv \
+ include/boost_1_59_0 \
+ cmd-line-utils/libedit \
+ libevent \
+ zlib || die
+}
+
+src_configure() {
+ # Needed, due to broken handling of CMAKE_BUILD_TYPE leading to
+ #
+ # error: 'fts_ast_node_type_get' was not declared in this scope
+ #
+ append-cppflags -DDBUG_OFF
+
+ # Upstream doesn't support C++14 -- build will fail with -fpermissive error
+ # https://bugs.mysql.com/bug.php?id=87956
+ append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
+
+ local mycmakeargs=(
+ -DBUILD_CONFIG=xtrabackup_release
+ -DWITH_EDITLINE=system
+ -DWITH_LIBEVENT=system
+ -DWITH_LZ4=system
+ -DWITH_SSL=bundled # uses yassl, which isn't packaged
+ -DWITH_ZLIB=system
+ -DWITH_PIC=ON
+ )
+
+ local CMAKE_BUILD_TYPE="Release"
+ cmake-utils_src_configure
+}
+
+src_install() {
+ local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+ dobin "${p}"/src/{xbcloud,xbcrypt,xbstream,xtrabackup}
+ dosym xtrabackup /usr/bin/innobackupex
+
+ einstalldocs
+ doman "${p}"/doc/source/build/man/*
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/, dev-db/percona-xtrabackup/
@ 2021-01-21 23:25 Thomas Deutschmann
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2021-01-21 23:25 UTC (permalink / raw
To: gentoo-commits
commit: ec58bff74ba8527408a98f7bd5cbd26c93242215
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 23:23:06 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 23:24:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec58bff7
dev-db/percona-xtrabackup: bump to v8.0.22-15
Closes: https://bugs.gentoo.org/766297
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-db/percona-xtrabackup/Manifest | 2 +
...backup-8.0.22-fix-building-against-ICU-68.patch | 28 ++++++++
.../percona-xtrabackup-8.0.22-remove-rpm.patch | 31 +++++++++
.../percona-xtrabackup-8.0.22.15.ebuild | 77 ++++++++++++++++++++++
4 files changed, 138 insertions(+)
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 0ee90423a98..e615bdce7bd 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,6 +1,8 @@
DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
DIST boost_1_70_0.tar.gz 116000903 BLAKE2B aefeddf5671295ae46fcfed033cef37cca1c70f88d7d3305636e0add98c277fc8170c7e3e0de58ff83a64389b5b430b81077b6852da5941aa4867845a7b08554 SHA512 3d8800d0aa864fb5484a5339ab75dee9bceca063122108e92d971f1d1295a9f09399b2dd88b117da7f0c4558b4f9fb1494eda1e3035498557bbe90e8f058668f
+DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
DIST percona-xtrabackup-2.4.20.tar.gz 59782001 BLAKE2B 25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99 SHA512 bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478
DIST percona-xtrabackup-2.4.21.tar.gz 61901220 BLAKE2B 77245818015d4e9c22d05cfeb254ff570ab490c43f9d2fd0e1c499e1e3fefb143b4659fb929740a563e2344b3cd7dfb408931c6d24b277f6df06886dfa83126e SHA512 8b14ef4620fdf836a090d07e5aeb78141eacf081a2cf1069d91af1ba5206e36e3e195f8acb06609f334661d6ad27937b31e997b0f1aabb9cef612d35fabd0284
DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
+DIST percona-xtrabackup-8.0.22-15.tar.gz 294237178 BLAKE2B 819d7594bc41e0adc1e6f2632e6ad50de7a2416c7577f48ea83948bed1b14c0c552c4c44597c84c86fa292bcbbaace185978956acdc39070f81ede6701f4af52 SHA512 f5295e2f1e3ee71931295f89dbd708eed936c4912ab3b6c122eb63795ee2e5154011ddf95cfad005a89c7f086f087f7fb19068d098b49202c697a95b58ee7672
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
new file mode 100644
index 00000000000..b3e1662a0cf
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
@@ -0,0 +1,28 @@
+From 16048ed60bef16d4bf1e361a59e7899845b9426a Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Sun, 20 Dec 2020 21:47:33 +0100
+Subject: [PATCH 10/10] Fix building against >=ICU-68
+
+Link: https://github.com/unicode-org/icu/commit/a18df7ba2834afc2b577a1d5a7d906868ade6fa9
+Bug: https://bugs.gentoo.org/759070
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ sql/mysqld.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sql/mysqld.cc b/sql/mysqld.cc
+index c400e5584..5d2ebfaea 100644
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -7323,7 +7323,7 @@ int mysqld_main(int argc, char **argv)
+ if (opt_keyring_migration_source || opt_keyring_migration_destination ||
+ migrate_connect_options) {
+ Migrate_keyring mk;
+- my_getopt_skip_unknown = TRUE;
++ my_getopt_skip_unknown = true;
+ if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source,
+ opt_keyring_migration_destination, opt_keyring_migration_user,
+ opt_keyring_migration_host, opt_keyring_migration_password,
+--
+2.29.2
+
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
new file mode 100644
index 00000000000..91f67c43716
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
@@ -0,0 +1,31 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -222,28 +222,6 @@ ENDIF()
+ OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
+ MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
+
+-# Use 'uname -r' and 'rpm -qf /' to figure out host system.
+-# For Docker images we cannot trust uname, so use rpm instead.
+-IF(UNIX)
+- FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
+- IF(MY_UNAME)
+- EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
+- OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- RESULT_VARIABLE MY_UNAME_RESULT
+- )
+- EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
+- ENDIF()
+- FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
+- IF(MY_RPM)
+- EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
+- OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- RESULT_VARIABLE MY_RPM_RESULT
+- )
+- ENDIF()
+-ENDIF()
+-
+ # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
+ IF(APPLE)
+ IF(MY_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.22.15.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.22.15.ebuild
new file mode 100644
index 00000000000..1f27bfcbcf1
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.22.15.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+MY_BOOST_VERSION="1.73.0"
+MY_PV=$(ver_rs 3 '-')
+MY_PV="${MY_PV//_pre*}"
+MY_PN="Percona-XtraBackup"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+ https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ app-arch/lz4:0=
+ app-editors/vim-core
+ dev-libs/icu:=
+ dev-libs/libaio
+ dev-libs/libedit
+ dev-libs/libev
+ dev-libs/libevent:0=
+ dev-libs/libgcrypt:0=
+ dev-libs/libgpg-error
+ dev-libs/openssl:0=
+ dev-libs/protobuf:=
+ dev-libs/rapidjson
+ dev-libs/re2:=
+ dev-python/sphinx
+ net-misc/curl
+ sys-libs/zlib:="
+
+RDEPEND="
+ ${DEPEND}
+ !dev-db/percona-xtrabackup-bin
+ dev-perl/DBD-mysql"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.22-remove-rpm.patch
+ "${FILESDIR}"/${PN}-8.0.22-fix-building-against-ICU-68.patch
+)
+
+S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_CONFIG=xtrabackup_release
+ -DBUILD_SHARED_LIBS=OFF
+ -DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
+ -DWITH_SYSTEM_LIBS=ON
+ )
+ local CMAKE_BUILD_TYPE="Release"
+ cmake_src_configure
+}
+
+src_install() {
+ local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+ dobin "${p}"/xbcloud_osenv
+ dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
+
+ dolib.so "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
+
+ doman "${p}"/doc/source/build/man/*
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/, dev-db/percona-xtrabackup/
@ 2021-06-08 9:53 Thomas Deutschmann
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2021-06-08 9:53 UTC (permalink / raw
To: gentoo-commits
commit: 83df4ca15e424d3bb6b7098332063a4a56dc3445
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 8 09:53:35 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 8 09:53:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83df4ca1
dev-db/percona-xtrabackup: bump to v8.0.25-17
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-db/percona-xtrabackup/Manifest | 1 +
.../percona-xtrabackup-8.0.25-remove-rpm.patch | 37 ++++++++++
.../percona-xtrabackup-8.0.25.17.ebuild | 85 ++++++++++++++++++++++
3 files changed, 123 insertions(+)
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index bbb0901a006..a6c4d7edd13 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -8,3 +8,4 @@ DIST percona-xtrabackup-2.4.22.tar.gz 61911038 BLAKE2B 4e0eb211b253ac3bbe82af7b4
DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
DIST percona-xtrabackup-8.0.22-15.tar.gz 294237178 BLAKE2B 819d7594bc41e0adc1e6f2632e6ad50de7a2416c7577f48ea83948bed1b14c0c552c4c44597c84c86fa292bcbbaace185978956acdc39070f81ede6701f4af52 SHA512 f5295e2f1e3ee71931295f89dbd708eed936c4912ab3b6c122eb63795ee2e5154011ddf95cfad005a89c7f086f087f7fb19068d098b49202c697a95b58ee7672
DIST percona-xtrabackup-8.0.23-16.tar.gz 288261551 BLAKE2B ca82bfcac881cd1d9d3a1d0ea4647d809030b617cc8605f26f1378fba74f106b522447fc67be3968fe72bd8c6bd9fa64ba1943d8379c11f241178aa232680f06 SHA512 11927649ab2a25dbfc5268ab2196dbdd2b102229728a41dc61995aec92a133718c0bf79d3fe15ea91e0917cd4201bba806647d259a6aa0fc7b59ff8bd533e810
+DIST percona-xtrabackup-8.0.25-17.tar.gz 291581323 BLAKE2B 3860994ce969abc72378d29b32768c70ab4210f55400ad47d446b6e50b97fd6e90f124388663b02ba0e41fbb1c0ac4106c337861da46006442072591cfff2ba5 SHA512 f7186881c8422f6802efb813644c5721bb274db54afb591b58fe9ee1a084fba6546c7673f461b4d581c01ff0cbda588cb96b7fe21d669b3d9cbe3b5898288e08
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.25-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.25-remove-rpm.patch
new file mode 100644
index 00000000000..9496e73d24c
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.25-remove-rpm.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -193,33 +193,6 @@ ENDIF()
+ OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
+ MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
+
+-# Use 'uname -r' and 'rpm -qf /' to figure out host system.
+-# For Docker images we cannot trust uname, so use rpm instead.
+-IF(UNIX)
+- FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
+- IF(MY_UNAME)
+- EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
+- OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- RESULT_VARIABLE MY_UNAME_RESULT
+- )
+- EXECUTE_PROCESS(COMMAND ${MY_UNAME} -m
+- OUTPUT_VARIABLE MY_HOST_MACHINE_NAME
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- RESULT_VARIABLE MY_UNAME_MACHINE_RESULT
+- )
+- EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
+- ENDIF()
+- FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
+- IF(MY_RPM)
+- EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
+- OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- RESULT_VARIABLE MY_RPM_RESULT
+- )
+- ENDIF()
+-ENDIF()
+-
+ # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
+ IF(APPLE)
+ IF(MY_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
+
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.25.17.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.25.17.ebuild
new file mode 100644
index 00000000000..4c813b45c01
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.25.17.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+MY_BOOST_VERSION="1.73.0"
+MY_PV=$(ver_rs 3 '-')
+MY_PV="${MY_PV//_pre*}"
+MY_PN="Percona-XtraBackup"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+ https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ app-arch/lz4:0=
+ app-editors/vim-core
+ dev-libs/icu:=
+ dev-libs/libaio
+ dev-libs/libedit
+ dev-libs/libev
+ dev-libs/libevent:0=
+ dev-libs/libgcrypt:0=
+ dev-libs/libgpg-error
+ dev-libs/openssl:0=
+ dev-libs/protobuf:=
+ dev-libs/rapidjson
+ dev-libs/re2:=
+ dev-python/sphinx
+ net-misc/curl
+ sys-libs/zlib:="
+
+RDEPEND="
+ ${DEPEND}
+ !dev-db/percona-xtrabackup-bin
+ dev-perl/DBD-mysql"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.25-remove-rpm.patch
+)
+
+S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
+
+src_configure() {
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DBUILD_SHARED_LIBS=OFF
+ -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+ -DINSTALL_PLUGINDIR=$(get_libdir)/${PN}/plugin
+ -DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
+ -DWITH_MAN_PAGES=ON
+ -DWITH_SYSTEM_LIBS=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+ dobin "${p}"/xbcloud_osenv
+ dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
+
+ # cannot use dolib.so because helper would append libdir to target dir
+ insinto /usr/$(get_libdir)/${PN}/plugin
+ insopts -m 0755
+ doins "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
+
+ doman "${p}"/doc/source/build/man/*
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/, dev-db/percona-xtrabackup/
@ 2022-06-10 2:45 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-06-10 2:45 UTC (permalink / raw
To: gentoo-commits
commit: eeca3ee8974115da795637014aab52981ce4788c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 02:24:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 02:27:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeca3ee8
dev-db/percona-xtrabackup: fix build with GCC 12
Closes: https://bugs.gentoo.org/840335
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/percona-xtrabackup-8.0.26.18-gcc-12.patch | 21 +++++++++++++++++++++
.../percona-xtrabackup-8.0.26.18.ebuild | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26.18-gcc-12.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26.18-gcc-12.patch
new file mode 100644
index 000000000000..f9d1f79c97ea
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26.18-gcc-12.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/840335
+--- a/client/logger.cc
++++ b/client/logger.cc
+@@ -27,6 +27,7 @@
+ #include <time.h>
+ #include <iostream>
+ #include <locale>
++#include <memory>
+
+ using namespace std;
+
+--- a/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
++++ b/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
+@@ -25,6 +25,7 @@
+ #include <cstring>
+ #include <iostream>
+ #include <locale>
++#include <memory>
+ #include <sstream>
+
+ #include <m_string.h>
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
index 896af1ba69aa..5a9f56ff952c 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -49,6 +49,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-8.0.26-remove-rpm.patch
+ "${FILESDIR}"/${PN}-8.0.26.18-gcc-12.patch
)
S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/, dev-db/percona-xtrabackup/
@ 2022-10-31 1:43 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-10-31 1:43 UTC (permalink / raw
To: gentoo-commits
commit: c2eb76c5cb05a6f1a4e8d14ffcd811dc58f1c83f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 01:08:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 01:42:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2eb76c5
dev-db/percona-xtrabackup: drop 8.0.25.17
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/percona-xtrabackup/Manifest | 1 -
.../percona-xtrabackup-8.0.25-remove-rpm.patch | 37 ----------
.../percona-xtrabackup-8.0.25.17.ebuild | 85 ----------------------
3 files changed, 123 deletions(-)
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index b3ed6bca51c9..e035d43b48cc 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -2,5 +2,4 @@ DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec
DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
DIST percona-xtrabackup-2.4.24.tar.gz 61985764 BLAKE2B 99531853b7e125bfe1d133d3dd902f3f68d50a6c127c09ac87652d70aee5c4d764ba7b102879bea0eb67c0a2f1a94633889786c0a7a1f6bc3f9ed54fe51a217d SHA512 de25639a6e204d2e4018c922ccbd5119c5696d03e0b445f81968b15c2179a46ae8844014e78aa89f6a0a3cd5aef20adc744c979926366673f78c347d6a4e0201
-DIST percona-xtrabackup-8.0.25-17.tar.gz 291581323 BLAKE2B 3860994ce969abc72378d29b32768c70ab4210f55400ad47d446b6e50b97fd6e90f124388663b02ba0e41fbb1c0ac4106c337861da46006442072591cfff2ba5 SHA512 f7186881c8422f6802efb813644c5721bb274db54afb591b58fe9ee1a084fba6546c7673f461b4d581c01ff0cbda588cb96b7fe21d669b3d9cbe3b5898288e08
DIST percona-xtrabackup-8.0.26-18.tar.gz 294169182 BLAKE2B 250437badd9bcaea92b0f254fad27a775014f17215e764114bba3d1cf0882135127738a4db78349cb9d519e6a9b5bc015f04747ad8ebfc09245ebad3aa890400 SHA512 0cceb6758364c31167ef0b47176e1950273e80e5266b91e12353287dfae6e3a87382b29a466920e5e58add1f461295199a70bb070a225458ed8a7de844e012ea
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.25-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.25-remove-rpm.patch
deleted file mode 100644
index 9496e73d24c6..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.25-remove-rpm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -193,33 +193,6 @@ ENDIF()
- OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
- MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
-
--# Use 'uname -r' and 'rpm -qf /' to figure out host system.
--# For Docker images we cannot trust uname, so use rpm instead.
--IF(UNIX)
-- FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
-- IF(MY_UNAME)
-- EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
-- OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- RESULT_VARIABLE MY_UNAME_RESULT
-- )
-- EXECUTE_PROCESS(COMMAND ${MY_UNAME} -m
-- OUTPUT_VARIABLE MY_HOST_MACHINE_NAME
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- RESULT_VARIABLE MY_UNAME_MACHINE_RESULT
-- )
-- EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
-- ENDIF()
-- FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
-- IF(MY_RPM)
-- EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
-- OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- RESULT_VARIABLE MY_RPM_RESULT
-- )
-- ENDIF()
--ENDIF()
--
- # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
- IF(APPLE)
- IF(MY_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
-
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.25.17.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.25.17.ebuild
deleted file mode 100644
index 4c813b45c01f..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.25.17.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"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-MY_BOOST_VERSION="1.73.0"
-MY_PV=$(ver_rs 3 '-')
-MY_PV="${MY_PV//_pre*}"
-MY_PN="Percona-XtraBackup"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
- https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- app-arch/lz4:0=
- app-editors/vim-core
- dev-libs/icu:=
- dev-libs/libaio
- dev-libs/libedit
- dev-libs/libev
- dev-libs/libevent:0=
- dev-libs/libgcrypt:0=
- dev-libs/libgpg-error
- dev-libs/openssl:0=
- dev-libs/protobuf:=
- dev-libs/rapidjson
- dev-libs/re2:=
- dev-python/sphinx
- net-misc/curl
- sys-libs/zlib:="
-
-RDEPEND="
- ${DEPEND}
- !dev-db/percona-xtrabackup-bin
- dev-perl/DBD-mysql"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-8.0.25-remove-rpm.patch
-)
-
-S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
-
-src_configure() {
- CMAKE_BUILD_TYPE="RelWithDebInfo"
-
- local mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
- -DBUILD_SHARED_LIBS=OFF
- -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
- -DINSTALL_PLUGINDIR=$(get_libdir)/${PN}/plugin
- -DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
- -DWITH_MAN_PAGES=ON
- -DWITH_SYSTEM_LIBS=ON
- )
-
- cmake_src_configure
-}
-
-src_install() {
- local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
- dobin "${p}"/xbcloud_osenv
- dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
-
- # cannot use dolib.so because helper would append libdir to target dir
- insinto /usr/$(get_libdir)/${PN}/plugin
- insopts -m 0755
- doins "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
-
- doman "${p}"/doc/source/build/man/*
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/, dev-db/percona-xtrabackup/
@ 2023-09-04 18:54 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-09-04 18:54 UTC (permalink / raw
To: gentoo-commits
commit: b537cd6ac3b9c413dc0077c252ff8a3d14ba2efa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 4 18:15:20 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 4 18:54:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b537cd6a
dev-db/percona-xtrabackup: drop 2.4.15, 8.0.26.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-db/percona-xtrabackup/Manifest | 3 -
...ercona-xtrabackup-2.4.11-fix-gcc6-isystem.patch | 113 ---------------------
.../percona-xtrabackup-8.0.26.18-gcc-12.patch | 21 ----
.../percona-xtrabackup-2.4.15.ebuild | 79 --------------
.../percona-xtrabackup-8.0.26.18.ebuild | 86 ----------------
5 files changed, 302 deletions(-)
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 7935294f6a94..5cc9e51a3fa0 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,7 +1,4 @@
DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
-DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
DIST percona-xtrabackup-2.4.24.tar.gz 61985764 BLAKE2B 99531853b7e125bfe1d133d3dd902f3f68d50a6c127c09ac87652d70aee5c4d764ba7b102879bea0eb67c0a2f1a94633889786c0a7a1f6bc3f9ed54fe51a217d SHA512 de25639a6e204d2e4018c922ccbd5119c5696d03e0b445f81968b15c2179a46ae8844014e78aa89f6a0a3cd5aef20adc744c979926366673f78c347d6a4e0201
-DIST percona-xtrabackup-8.0.26-18.tar.gz 294169182 BLAKE2B 250437badd9bcaea92b0f254fad27a775014f17215e764114bba3d1cf0882135127738a4db78349cb9d519e6a9b5bc015f04747ad8ebfc09245ebad3aa890400 SHA512 0cceb6758364c31167ef0b47176e1950273e80e5266b91e12353287dfae6e3a87382b29a466920e5e58add1f461295199a70bb070a225458ed8a7de844e012ea
DIST percona-xtrabackup-8.0.30-23.tar.gz 338259133 BLAKE2B 3b73731497013aea6abae7d83cd96914cb5300dd867f6066514c71d68f8a1420227e33512a5f2faf082029ccd2c871394acbf43fb58c029472cbeb5605f354fc SHA512 acada88f3509526259281b7f9805fcabb31c5924eb50c5ed761b0813f89adda046b060a57825b6a49178171daec8b4388e99202ef9c9def4b2b0932e73b4d535
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch
deleted file mode 100644
index 4fed659cdae6..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Do not use -isystem to add headers, as they break GCC 6's header wrapping.
-See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
-
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index dbf1c48..e5d7347 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -52,7 +52,7 @@ IF(NOT WITHOUT_SERVER)
- upgrade/program.cc
- )
- ADD_COMPILE_FLAGS(
-- upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
-diff --git a/client/base/CMakeLists.txt b/client/base/CMakeLists.txt
-index b206de7..91cce4c 100644
---- a/client/base/CMakeLists.txt
-+++ b/client/base/CMakeLists.txt
-@@ -49,7 +49,7 @@ ADD_COMPILE_FLAGS(
- mutex.cc
- mysql_query_runner.cc
- show_variable_query_extractor.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- TARGET_LINK_LIBRARIES(client_base mysqlclient)
-diff --git a/client/dump/CMakeLists.txt b/client/dump/CMakeLists.txt
-index fdbb631..bae2ce7 100644
---- a/client/dump/CMakeLists.txt
-+++ b/client/dump/CMakeLists.txt
-@@ -50,7 +50,7 @@ IF(USING_LOCAL_BOOST)
-
- ADD_COMPILE_FLAGS(
- ${BOOST_LIB_SOURCES}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- IF(HAVE_clock_gettime_IN_rt)
-@@ -145,7 +145,7 @@ TARGET_LINK_LIBRARIES(mysqlpump_lib
-
- ADD_COMPILE_FLAGS(
- ${MYSQLPUMP_LIB_SOURCES}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- # Files that use Boost sources that trigger compilation warnings
-@@ -179,7 +179,7 @@ ADD_COMPILE_FLAGS(
- )
- MYSQL_ADD_EXECUTABLE(mysqlpump program.cc)
- ADD_COMPILE_FLAGS(
-- program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- TARGET_LINK_LIBRARIES(mysqlpump mysqlpump_lib ${LOCAL_BOOST_LIB})
-diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
-index 44c1d26..dac03d9 100644
---- a/libmysqld/CMakeLists.txt
-+++ b/libmysqld/CMakeLists.txt
-@@ -123,7 +123,7 @@ ADD_COMPILE_FLAGS(
- ../sql/item_geofunc_setops.cc
- ../sql/item_json_func.cc
- ../sql/spatial.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- ADD_COMPILE_FLAGS(
-diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
-index 1d1231f..9a35fa8 100644
---- a/sql/CMakeLists.txt
-+++ b/sql/CMakeLists.txt
-@@ -312,7 +312,7 @@ ADD_COMPILE_FLAGS(
- item_geofunc_setops.cc
- item_json_func.cc
- spatial.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- ADD_COMPILE_FLAGS(
-diff --git a/unittest/gunit/CMakeLists.txt b/unittest/gunit/CMakeLists.txt
-index f0123b8..f2169f9 100644
---- a/unittest/gunit/CMakeLists.txt
-+++ b/unittest/gunit/CMakeLists.txt
-@@ -385,7 +385,7 @@ IF (MERGE_UNITTESTS)
- ENDIF()
- ADD_COMPILE_FLAGS(
- ${MERGE_SMALL_TESTS}
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
- # Fixes "C1128: number of sections exceeded object file format limit" in MSVC
- IF(WIN32)
-@@ -467,11 +467,11 @@ ENDIF(MERGE_UNITTESTS)
- ENDIF()
- ADD_COMPILE_FLAGS(
- bounded_queue-t.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
- ADD_COMPILE_FLAGS(
- pump_object_filter-t.cc
-- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR}
-+ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
- )
-
- FOREACH(test ${SERVER_TESTS})
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26.18-gcc-12.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26.18-gcc-12.patch
deleted file mode 100644
index f9d1f79c97ea..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.26.18-gcc-12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/840335
---- a/client/logger.cc
-+++ b/client/logger.cc
-@@ -27,6 +27,7 @@
- #include <time.h>
- #include <iostream>
- #include <locale>
-+#include <memory>
-
- using namespace std;
-
---- a/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
-+++ b/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
-@@ -25,6 +25,7 @@
- #include <cstring>
- #include <iostream>
- #include <locale>
-+#include <memory>
- #include <sstream>
-
- #include <m_string.h>
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
deleted file mode 100644
index 9e800bfb475a..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
- mirror://sourceforge/boost/boost_1_59_0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- app-arch/lz4:0=
- app-editors/vim-core
- dev-libs/libaio
- dev-libs/libedit
- dev-libs/libev
- dev-libs/libevent:0=
- dev-libs/libgcrypt:0=
- dev-libs/libgpg-error
- dev-python/sphinx
- net-misc/curl
- sys-libs/zlib:="
-
-RDEPEND="
- ${DEPEND}
- !dev-db/percona-xtrabackup-bin
- dev-perl/DBD-mysql"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
- "${FILESDIR}"/${PN}-2.4.11-fix-gcc6-isystem.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # remove bundled libedit, libevent, zlib
- # just to be safe...
- # We keep lz4 directory because we use extra/lz4/xxhash.c in cmake/libutils.cmake
- rm -rv \
- cmd-line-utils/libedit \
- libevent \
- zlib || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CONFIG=xtrabackup_release
- -DBUILD_SHARED_LIBS=OFF
- -DWITH_BOOST="${WORKDIR}/boost_1_59_0"
- -DWITH_EDITLINE=system
- -DWITH_LIBEVENT=system
- -DWITH_LZ4=system
- -DWITH_SSL=bundled # uses yassl, which isn't packaged
- -DWITH_ZLIB=system
- -DWITH_PIC=ON
- )
-
- local CMAKE_BUILD_TYPE="Release"
- cmake_src_configure
-}
-
-src_install() {
- local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
- dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
- dosym xtrabackup /usr/bin/innobackupex
-
- einstalldocs
- doman "${p}"/doc/source/build/man/*
-}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
deleted file mode 100644
index a295c5613862..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic
-
-MY_BOOST_VERSION="1.73.0"
-MY_PV=$(ver_rs 3 '-')
-MY_PV="${MY_PV//_pre*}"
-MY_PN="Percona-XtraBackup"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-
-DESCRIPTION="Hot backup utility for MySQL based servers"
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
-SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
- https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- app-arch/lz4:0=
- app-editors/vim-core
- dev-libs/icu:=
- dev-libs/libaio
- dev-libs/libedit
- dev-libs/libev
- dev-libs/libevent:0=
- dev-libs/libgcrypt:0=
- dev-libs/libgpg-error
- dev-libs/openssl:0=
- dev-libs/protobuf:=
- dev-libs/rapidjson
- dev-libs/re2:=
- dev-python/sphinx
- net-misc/curl
- sys-libs/zlib:="
-
-RDEPEND="
- ${DEPEND}
- !dev-db/percona-xtrabackup-bin
- dev-perl/DBD-mysql"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-8.0.26-remove-rpm.patch
- "${FILESDIR}"/${PN}-8.0.26.18-gcc-12.patch
-)
-
-S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
-
-src_configure() {
- CMAKE_BUILD_TYPE="RelWithDebInfo"
-
- local mycmakeargs=(
- -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
- -DBUILD_SHARED_LIBS=OFF
- -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
- -DINSTALL_PLUGINDIR=$(get_libdir)/${PN}/plugin
- -DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
- -DWITH_MAN_PAGES=ON
- -DWITH_SYSTEM_LIBS=ON
- )
-
- cmake_src_configure
-}
-
-src_install() {
- local p="${BUILD_DIR}/storage/innobase/xtrabackup"
-
- dobin "${p}"/xbcloud_osenv
- dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
-
- # cannot use dolib.so because helper would append libdir to target dir
- insinto /usr/$(get_libdir)/${PN}/plugin
- insopts -m 0755
- doins "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
-
- doman "${p}"/doc/source/build/man/*
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/, dev-db/percona-xtrabackup/
@ 2024-08-08 16:06 Eli Schwartz
0 siblings, 0 replies; 7+ messages in thread
From: Eli Schwartz @ 2024-08-08 16:06 UTC (permalink / raw
To: gentoo-commits
commit: d36216af23a4eaa6a6c8d25e04d92dd4c71987ce
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 7 22:02:02 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Aug 8 16:06:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36216af
dev-db/percona-xtrabackup: backport patch to fix compilation with procps 4
Without this patch, it fails to build at all. No revbump.
Closes: https://bugs.gentoo.org/913649
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
.../6038a7934cbd4e6c01389fdc9b8ffabf8c3e006a.patch | 139 +++++++++++++++++++++
.../percona-xtrabackup-8.0.30.23.ebuild | 4 +-
2 files changed, 142 insertions(+), 1 deletion(-)
diff --git a/dev-db/percona-xtrabackup/files/6038a7934cbd4e6c01389fdc9b8ffabf8c3e006a.patch b/dev-db/percona-xtrabackup/files/6038a7934cbd4e6c01389fdc9b8ffabf8c3e006a.patch
new file mode 100644
index 000000000000..30c333128166
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/6038a7934cbd4e6c01389fdc9b8ffabf8c3e006a.patch
@@ -0,0 +1,139 @@
+From 6038a7934cbd4e6c01389fdc9b8ffabf8c3e006a Mon Sep 17 00:00:00 2001
+From: Marcelo Altmann <marcelo.altmann@percona.com>
+Date: Tue, 20 Jun 2023 15:41:12 -0300
+Subject: [PATCH] Fixed PXB-2993 - make PXB compatible with procps-4
+
+Fixed Issue with procps version 4.
+Now we detect the version during cmake and use the correct library
+when linking xbtrabackup
+
+This also fixes PXB-3066 - Compilation issues on Debian 12
+---
+ cmake/procps.cmake | 32 +++++++++++++++++++
+ .../innobase/xtrabackup/src/CMakeLists.txt | 10 ++++--
+ storage/innobase/xtrabackup/src/utils.cc | 24 +++++++++++++-
+ 3 files changed, 62 insertions(+), 4 deletions(-)
+ create mode 100644 cmake/procps.cmake
+
+diff --git a/cmake/procps.cmake b/cmake/procps.cmake
+new file mode 100644
+index 000000000000..f463248c48eb
+--- /dev/null
++++ b/cmake/procps.cmake
+@@ -0,0 +1,32 @@
++# Copyright (c) 2023 Percona LLC and/or its affiliates
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; version 2 of the License.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++
++MACRO (FIND_PROCPS)
++ FIND_FILE(PROCPS_INCLUDE_DIR NAMES proc/procps.h NO_CACHE)
++ IF (PROCPS_INCLUDE_DIR)
++ MESSAGE("-- Found proc/sysinfo.h in ${PROCPS_INCLUDE_DIR} Procps version 3.")
++ ADD_DEFINITIONS(-DHAVE_PROCPS_V3)
++ SET(PROCPS_VERSION "3")
++ ELSE()
++ FIND_FILE(PROCPS_INCLUDE_DIR NAMES libproc2/meminfo.h NO_CACHE)
++ IF (PROCPS_INCLUDE_DIR)
++ MESSAGE("-- Found libproc2/meminfo.h in ${PROCPS_INCLUDE_DIR}. Procps version 4.")
++ ADD_DEFINITIONS(-DHAVE_PROCPS_V4)
++ SET(PROCPS_VERSION "4")
++ ELSE()
++ MESSAGE(SEND_ERROR "Cannot find proc/sysinfo.h or libproc2/meminfo.h in ${PROCPS_INCLUDE_PATH}. You can pass it to CMake with -DPROCPS_INCLUDE_PATH=<path> or install procps-devel/procps-ng-devel/libproc2-dev package")
++ ENDIF()
++ ENDIF()
++ENDMACRO()
+diff --git a/storage/innobase/xtrabackup/src/CMakeLists.txt b/storage/innobase/xtrabackup/src/CMakeLists.txt
+index e3a1b9056536..68e33365a36b 100644
+--- a/storage/innobase/xtrabackup/src/CMakeLists.txt
++++ b/storage/innobase/xtrabackup/src/CMakeLists.txt
+@@ -14,12 +14,14 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+ INCLUDE(gcrypt)
++INCLUDE(procps)
+
+ OPTION(WITH_VERSION_CHECK "Build with version check" ON)
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+ FIND_GCRYPT()
++FIND_PROCPS()
+
+ CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG)
+
+@@ -134,9 +136,11 @@ TARGET_LINK_LIBRARIES(xtrabackup
+ )
+
+ IF(NOT APPLE)
+- TARGET_LINK_LIBRARIES(xtrabackup
+- procps
+- )
++ IF(PROCPS_VERSION EQUAL 4)
++ TARGET_LINK_LIBRARIES(xtrabackup proc2)
++ ELSE()
++ TARGET_LINK_LIBRARIES(xtrabackup procps)
++ ENDIF()
+ ENDIF()
+
+ # We depend on protobuf because of the mysqlx plugin and replication.
+diff --git a/storage/innobase/xtrabackup/src/utils.cc b/storage/innobase/xtrabackup/src/utils.cc
+index 527d17d19d47..635b271b0ab1 100644
+--- a/storage/innobase/xtrabackup/src/utils.cc
++++ b/storage/innobase/xtrabackup/src/utils.cc
+@@ -23,8 +23,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ #include <mach/mach_host.h>
+ #include <sys/sysctl.h>
+ #else
++#ifdef HAVE_PROCPS_V3
+ #include <proc/sysinfo.h>
+-#endif
++#else
++#include <libproc2/meminfo.h>
++#endif // HAVE_PROCPS_V3
++#endif // __APPLE__
+ #include <boost/uuid/uuid.hpp> // uuid class
+ #include <boost/uuid/uuid_generators.hpp> // generators
+ #include <boost/uuid/uuid_io.hpp> // streaming operators etc.
+@@ -141,13 +145,31 @@ unsigned long host_free_memory() {
+ }
+ #else
+ unsigned long host_total_memory() {
++#ifdef HAVE_PROCPS_V3
+ meminfo();
+ return kb_main_total * 1024;
++#else
++ struct meminfo_info *mem_info;
++ if (procps_meminfo_new(&mem_info) < 0) {
++ return 0;
++ }
++
++ return MEMINFO_GET(mem_info, MEMINFO_MEM_TOTAL, ul_int) * 1024;
++#endif // HAVE_PROCPS_V3
+ }
+
+ unsigned long host_free_memory() {
++#ifdef HAVE_PROCPS_V3
+ meminfo();
+ return kb_main_available * 1024;
++#else
++ struct meminfo_info *mem_info;
++ if (procps_meminfo_new(&mem_info) < 0) {
++ return 0;
++ }
++
++ return MEMINFO_GET(mem_info, MEMINFO_MEM_AVAILABLE, ul_int) * 1024;
++#endif // HAVE_PROCPS_V3
+ }
+ #endif
+
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild
index c75845fa0b49..cf31400b9055 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -51,6 +51,8 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-8.0.26-remove-rpm.patch
"${FILESDIR}"/${PN}-8.0.30.23-gcc13.patch
+ # procps 4 support, released in 8.0.33
+ "${FILESDIR}"/6038a7934cbd4e6c01389fdc9b8ffabf8c3e006a.patch
)
S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-08-08 16:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-21 23:25 [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-xtrabackup/files/, dev-db/percona-xtrabackup/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2024-08-08 16:06 Eli Schwartz
2023-09-04 18:54 Andreas Sturmlechner
2022-10-31 1:43 Sam James
2022-06-10 2:45 Sam James
2021-06-08 9:53 Thomas Deutschmann
2018-05-04 14:40 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox