summaryrefslogtreecommitdiff
path: root/dev-db/mydumper
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/mydumper')
-rw-r--r--dev-db/mydumper/Manifest6
-rw-r--r--dev-db/mydumper/files/mydumper-0.14-Do-not-overwrite-the-user-CFLAGS.patch29
-rw-r--r--dev-db/mydumper/files/mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch25
-rw-r--r--dev-db/mydumper/mydumper-0.14.5.2.ebuild16
-rw-r--r--dev-db/mydumper/mydumper-0.15.2.8.ebuild14
5 files changed, 79 insertions, 11 deletions
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 18f675218493..f59fd7744f33 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,6 +1,8 @@
AUX mydumper-0.13.1-atomic.patch 965 BLAKE2B 789b72fc49a8362466b7081ea6f112d373ebfb428959be96bbf4f9a7dc42366f90d574040a3aed9d32af29074fcda1da96850522d78f8f11c32d925a40d80348 SHA512 4bf764fb119a9c6fd2ab106e20259b48c526729a49ebbb93b3d27e483170ebbb849dcd2af1599ce41ee3ff26233735fbc02f39a8402b0d526f224cdb148663f8
+AUX mydumper-0.14-Do-not-overwrite-the-user-CFLAGS.patch 1460 BLAKE2B d2b66719b9191a7f7580ceebec060949a9effdbe11c75d27120c0a7caa2ac1ca67365232b614ae5f9717c1d8b4e693fb5571456217fa807eb4fee5c791cd70ab SHA512 ed6162d0d70a0322ea5f27be1808b2dfe546632eb029aa8dc542b280cd99086f8b473d1cbcb2843b6a0c038cd391147627c11966d1730707af0a9998cb19ff7b
+AUX mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch 984 BLAKE2B 6b47af57b37adf29e273c9ce4384e75efe9ad4ed89ff54bf93ac491d7149f240b4b67263886c30acc6f69c60fe05cdf14572da781614d7a2697ddd5defeb1d4d SHA512 959c56f38912844e7e10aced0e9bde14ea5db68962de83b0649647ebd348c94a0999e17845cd2b2f565f5e14c942930b9c7b7020247378d211d9894cb977a8ac
DIST mydumper-0.14.5-2.tar.gz 177402 BLAKE2B bcd2658e1d8e452803608f27ed1b2ccc6fe428fcb44117f88a5cb0e6de1536f89c1f0768020da2d954a95cc20fe1315af8a38f477aee7c394540fbb4f001ac8d SHA512 d19c22fb3932f7428f560dcd7cdafc92e035f924ee35320048eca2067e75a297a44aaf08c6f124ef55c604c34311be2eeb0858c6d41be5ea73a68c8c0afa66ab
DIST mydumper-0.15.2-8.tar.gz 186389 BLAKE2B 84e08fa6460a156771f598a8a0c98c79089490f9f2fe3b90fa49efd519e2270468fe86287bab03612006489a3a1d5ab2442e76cc0f4825c8df95acec30a1c4ba SHA512 f6ca5c5756944bd2704e8a25432db1fbe14ed2a1e88b549c0799c3e0c251e524523ed39797b0b2c15c9d65c0e6e5ce3d93a60a17c77090732a8f909ab24a0126
-EBUILD mydumper-0.14.5.2.ebuild 1102 BLAKE2B 2e1743a1987be5f590f2f1c476fcb3abc2c9ce7f02ab845ddfbb364e8442cc2efadcf8ee7cc3b04e405161ca5f1807e3e9be44784b480990b92fdd3d2716ef3f SHA512 8b87467ae203c860399fd6411ce3fe8a506216d89ddcdfb5d225f31723847c9d17fbd66c97af7f6e242e0b1298b77eece1fd68f7deb1807c4608f63e5a9e9e23
-EBUILD mydumper-0.15.2.8.ebuild 1101 BLAKE2B e015b3ad75af1d80fd5740086b02f16e4bfbacafc210fce0c3071f270b90fc471f6bbd15ce0d8c80a3a42fc01eff51d29f226443d054bd99564d51d599e627da SHA512 f44fbe3608ac76327a6cb5634d6e3c1dd3855be0944a77f373928bee84ddffa908616957cd86033df682a8ec3854bfdc1d8c01a4f21f8d2479480ebc00016015
+EBUILD mydumper-0.14.5.2.ebuild 1213 BLAKE2B d00d9fbcf99d50e9956b4413158ac3f0de02d735a6f9518dc6dbf2e506cf8061060b97c0fe39d384f1d0347de8d2c7eec6da5c7d50d47e6c74eed20feb68ff48 SHA512 53d2b66901a3b42543f3f301769a4cfb1d5465e5e958c0a020452b50c1d906dd2211fca9892dc592212146b9c47b92b2f283744c0711755dfc579700b5058005
+EBUILD mydumper-0.15.2.8.ebuild 1216 BLAKE2B a07ac2f9da30457597d727251e08bacc383d0c46ba696895f4554d9741a3f23fe8b2187d739e47b9286024117ea7264494d94b38ac8d4f15270a5d8105e6482b SHA512 252dffa78f47c186eabc7122454d025cb2a50d230a4b79eb69b31620416d94e629bac9ea9fc2fa50f2325cae69727c476ba3557d5203e07e32d3bd20e770d65a
MISC metadata.xml 480 BLAKE2B b046228a8aea053cdd034cb3ce0e28e3fd666fe9a600b7bb82a36083fff6686559a6746518ff8c41002476ac8214ff45376c5b08fa9e71c1e2ed1ed890b68091 SHA512 8d71ae229741c263328195baec3917d9c496d9afeff591e3c66ef8744776d8cbc53f17ff526255e61139338b03f5027e19142108dd9c37c0871a6510f72a8661
diff --git a/dev-db/mydumper/files/mydumper-0.14-Do-not-overwrite-the-user-CFLAGS.patch b/dev-db/mydumper/files/mydumper-0.14-Do-not-overwrite-the-user-CFLAGS.patch
new file mode 100644
index 000000000000..fe5fc15378d8
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-0.14-Do-not-overwrite-the-user-CFLAGS.patch
@@ -0,0 +1,29 @@
+From a7630737a37c11478de265e69605befa89b910b4 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 10 Mar 2024 21:12:29 -0400
+Subject: [PATCH] Do not overwrite the user CFLAGS
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 088811c..c051a31 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,10 +35,10 @@ if (WITH_ZSTD)
+ endif (WITH_ZSTD)
+
+ if (WITH_ZSTD)
+- set(CMAKE_C_FLAGS "-Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -g -DZWRAP_USE_ZSTD=1 -Werror -Wno-discarded-qualifiers ${MYSQL_CFLAGS}")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wextra -Wshadow -DZWRAP_USE_ZSTD=1 -Wno-discarded-qualifiers ${MYSQL_CFLAGS}")
+ include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIR} )
+ else (WITH_ZSTD)
+- set(CMAKE_C_FLAGS "-Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -g -Werror ${MYSQL_CFLAGS}")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wextra -Wshadow ${MYSQL_CFLAGS}")
+ include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} )
+ endif (WITH_ZSTD)
+
+--
+2.43.2
+
diff --git a/dev-db/mydumper/files/mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch b/dev-db/mydumper/files/mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch
new file mode 100644
index 000000000000..5d6ba09a4df4
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch
@@ -0,0 +1,25 @@
+From 925d052aa05cf7d97fe474d7cf64b8491ced68ae Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 10 Mar 2024 21:17:16 -0400
+Subject: [PATCH] Do not overwrite the user CFLAGS
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1fbf228..7741aa9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,7 +39,7 @@ if (MARIADB_FOUND AND NOT MARIADB_SSL AND WITH_SSL)
+ set(WITH_SSL OFF)
+ endif()
+
+-set(CMAKE_C_FLAGS "-std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -g -Werror ${MYSQL_CFLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wextra -Wshadow ${MYSQL_CFLAGS}")
+ include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} )
+
+ OPTION(WITH_ASAN "Build with ASAN" OFF)
+--
+2.43.2
+
diff --git a/dev-db/mydumper/mydumper-0.14.5.2.ebuild b/dev-db/mydumper/mydumper-0.14.5.2.ebuild
index 8777ec59b286..44adc19c83dd 100644
--- a/dev-db/mydumper/mydumper-0.14.5.2.ebuild
+++ b/dev-db/mydumper/mydumper-0.14.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit cmake
+inherit cmake flag-o-matic
MY_PV="$(ver_rs 3 -)"
MY_P="${PN}-${MY_PV}"
@@ -30,12 +30,11 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}/${PN}-0.13.1-atomic.patch" #654314
+
+ "${FILESDIR}"/${PN}-0.14-Do-not-overwrite-the-user-CFLAGS.patch
)
src_prepare() {
- # respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
- sed -i -e 's|-O3 -g -Werror|${CMAKE_C_FLAGS}|' CMakeLists.txt || die
-
# fix doc install path
sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
@@ -43,6 +42,13 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/855239
+ #
+ # Fixed upstream in git master:
+ # https://github.com/mydumper/mydumper/pull/1413
+ filter-lto
+
local mycmakeargs=(-DBUILD_DOCS=$(usex doc))
cmake_src_configure
diff --git a/dev-db/mydumper/mydumper-0.15.2.8.ebuild b/dev-db/mydumper/mydumper-0.15.2.8.ebuild
index 1a99e5e9f244..3163f03bbf04 100644
--- a/dev-db/mydumper/mydumper-0.15.2.8.ebuild
+++ b/dev-db/mydumper/mydumper-0.15.2.8.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake
+inherit cmake flag-o-matic
MY_PV="$(ver_rs 3 -)"
MY_P="${PN}-${MY_PV}"
@@ -30,12 +30,11 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}/${PN}-0.13.1-atomic.patch" #654314
+
+ "${FILESDIR}"/${PN}-0.15-Do-not-overwrite-the-user-CFLAGS.patch
)
src_prepare() {
- # respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
- sed -i -e 's|-g -Werror|${CMAKE_C_FLAGS}|' CMakeLists.txt || die
-
# fix doc install path
sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
@@ -43,6 +42,13 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/855239
+ #
+ # Fixed upstream in git master:
+ # https://github.com/mydumper/mydumper/pull/1413
+ filter-lto
+
local mycmakeargs=(-DBUILD_DOCS=$(usex doc))
cmake_src_configure
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 08:07:40 +0000