* [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/, dev-db/mydumper/files/
@ 2021-05-28 19:23 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2021-05-28 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 291fd90c8bc3a9dd9e8fc24b7fd6f64030669528
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri May 14 14:30:42 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri May 28 19:23:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291fd90c
dev-db/mydumper: bump to 0.10.5
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20804
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-db/mydumper/Manifest | 1 +
dev-db/mydumper/files/mydumper-0.10.5-atomic.patch | 27 +++++++++++++
dev-db/mydumper/mydumper-0.10.5.ebuild | 45 ++++++++++++++++++++++
3 files changed, 73 insertions(+)
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 6e72aa713bf..445dd2908e1 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,3 +1,4 @@
DIST mydumper-0.10.1.tar.gz 63967 BLAKE2B ad2876eb4fd6528c119d722e70b096d12698119e6d84737601d7bc0e71022926f579d21456b73b8ff1d384c961256538467badeaceaf60a92b333196a17dda10 SHA512 dbcb207c8ac61b286cd4464a3f2c67ea6972d1cab215c09a577cdf621f685011cc26e1e36399b72be2a8165b4e4c518b401be928b6a1a31e35d2f27c169dcc18
DIST mydumper-0.10.3.tar.gz 64622 BLAKE2B 14020b6bbb72271659dec965de164274e2bf81c72b52fa7c1d6997f393d1c0cc977d06d689bb7d7c6e3da86926add2c61f1551afdd30be71ddc97c4803d4e455 SHA512 d7cf6897815de3d46ec15cbcacc393722f7d547300a45e70960e47b8ce30e06a5e652f52a0ff8999d2ac3662b4a48927aadbab464668ac23f446eee95ba574cf
+DIST mydumper-0.10.5.tar.gz 66399 BLAKE2B 77bba97580bcdb267d77be455f56831209a29b71389337c844e4e0cb37749dc22d000d3845e936f5d589951a21ad61bf19cd3b9084004a62aa1b33f16f81b5a0 SHA512 61127c4b9ae5a01111d431672ec3818a6c3db74704ac5db12d286e380273968b8b9e56298ac73eb6c1c32649875fd2ee01d099a73c99cb9c8d4604eaf0eedb09
DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
diff --git a/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch b/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch
new file mode 100644
index 00000000000..6dc7fb5fd29
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch
@@ -0,0 +1,27 @@
+diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
+index 23470a8..2b8ae63 100644
+--- a/cmake/modules/FindMySQL.cmake
++++ b/cmake/modules/FindMySQL.cmake
+@@ -85,20 +85,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
+
+ set(TMP_MYSQL_LIBRARIES "")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES .so .lib .so.1 .dylib .a)
+-foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
+- find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
+- HINTS
+- ${MYSQL_ADD_LIBRARY_PATH}
+- /usr/lib/mysql
+- /usr/lib
+- /usr/local/lib
+- /usr/local/lib/mysql
+- /usr/local/mysql/lib
+- )
+- list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}")
+-endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES})
+-
+-set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
++
++set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL)
+
+ if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+ set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")
diff --git a/dev-db/mydumper/mydumper-0.10.5.ebuild b/dev-db/mydumper/mydumper-0.10.5.ebuild
new file mode 100644
index 00000000000..a9e9ab55b39
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.10.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/maxbube/mydumper"
+SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="app-arch/zstd
+ dev-db/mysql-connector-c:=
+ dev-libs/glib:=
+ dev-libs/libpcre:=
+ dev-libs/openssl:0=
+ sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ doc? ( dev-python/sphinx )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-atomic.patch" #654314
+)
+
+src_prepare() {
+ # respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
+ sed -i -e 's|-Werror -O3 -g|${CMAKE_C_FLAGS}|' CMakeLists.txt || die
+
+ # fix doc install path
+ sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=("-DBUILD_DOCS=$(usex doc)")
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/, dev-db/mydumper/files/
@ 2023-02-15 5:53 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-02-15 5:53 UTC (permalink / raw
To: gentoo-commits
commit: 4b0697e7f59dcda2a557c6dd66d6eca4e22e3793
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Feb 3 20:32:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 05:52:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0697e7
dev-db/mydumper: add 0.13.1.2
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/mydumper/Manifest | 1 +
dev-db/mydumper/files/mydumper-0.13.1-atomic.patch | 26 ++++++++++++
dev-db/mydumper/mydumper-0.13.1.2.ebuild | 49 ++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index e9d98b67f7fa..6840099c7548 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -2,3 +2,4 @@ DIST mydumper-0.11.5-2.tar.gz 110088 BLAKE2B c9e2f56ce7cc206f311ba00fd82e96479cd
DIST mydumper-0.12.1.tar.gz 114268 BLAKE2B d8fd459c645e0a8c7f978f0b948b534d3e602489ffdee926cc61d2f77053506c0b73a26b1dd89fc206dc9e7dea4b0c5cc848de6dbcceecf68450e5be9928be28 SHA512 90466520af4c26478b963a70ac9614889decae743fb40c3f5b6438b1e6db11ef284bd077288a0afa2aa02c93e9df32711d948cd868a7030d5215c2c7f5f96405
DIST mydumper-0.12.5-3.tar.gz 131104 BLAKE2B 436c92474c498f17e7cfd723d7dbdd9f56f0a3cd42be88233dcfee6a2768ff49c795bb232e5f4bad1d6d9eb5e1cedf7fa812bc3dbc7a4eeb8fbb4894034a5960 SHA512 03c4a219877c61a3659561afd37ba095030edd0f44f922de51d4801a08cf6dc17c5fc8864f9b47d4d7c70a94bd2f814192ab1fa66f174e27d5d0e8a3a09a6b02
DIST mydumper-0.12.7-3.tar.gz 136449 BLAKE2B 99906443c4195f1a43d11875156ccb943efea44c90d1e7b9a6fb3427ab87562dbf429b789d28ba285d6b8b6e0a13c279f34548b43ee28525636a01a4eaa86833 SHA512 266214d8ab11fb82ad64100cde8d57a873740bd2f14f5026eddbb25e196294a7533252e8f13ba57fa4224c5cac9914debca452efe68eea58d576282f8ba53f65
+DIST mydumper-0.13.1-2.tar.gz 154913 BLAKE2B 9c44ca368737fc87ed6138756909721dbdbddeb9ccef78b536dfe705da8e4a73ad5e084d08fef795c7535c33d47b25e631ce66f3c2638058fae2d37cb36b3a13 SHA512 6b6e411896e2527d02a1a7ecd4d6c6103f8bad0a67f41aea4ccd66285a86a9ba8dd0663f163a27f38a6130c9caf69bb3b9b9c5ae36a196de4ac03aff4dd87424
diff --git a/dev-db/mydumper/files/mydumper-0.13.1-atomic.patch b/dev-db/mydumper/files/mydumper-0.13.1-atomic.patch
new file mode 100644
index 000000000000..587d06804a53
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-0.13.1-atomic.patch
@@ -0,0 +1,26 @@
+diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
+index 2908251..109f0da 100644
+--- a/cmake/modules/FindMySQL.cmake
++++ b/cmake/modules/FindMySQL.cmake
+@@ -85,20 +85,7 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
+
+ set(TMP_MYSQL_LIBRARIES "")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES .so .lib .so.1 .dylib .a .tbd)
+-foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
+- find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
+- HINTS
+- ${MYSQL_ADD_LIBRARY_PATH}
+- /usr/lib/mysql
+- /usr/lib
+- /usr/local/lib
+- /usr/local/lib/mysql
+- /usr/local/mysql/lib
+- )
+- list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}")
+-endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES})
+-
+-set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
++set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL)
+
+ if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+ set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")
diff --git a/dev-db/mydumper/mydumper-0.13.1.2.ebuild b/dev-db/mydumper/mydumper-0.13.1.2.ebuild
new file mode 100644
index 000000000000..bcf83752cc30
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.13.1.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/maxbube/mydumper"
+SRC_URI="https://github.com/maxbube/mydumper/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="app-arch/zstd
+ dev-db/mysql-connector-c:=
+ dev-libs/glib:2
+ dev-libs/libpcre
+ dev-libs/openssl:=
+ sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ doc? ( dev-python/sphinx )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.13.1-atomic.patch" #654314
+)
+
+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
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(-DBUILD_DOCS=$(usex doc))
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/, dev-db/mydumper/files/
@ 2024-03-11 14:24 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-03-11 14:24 UTC (permalink / raw
To: gentoo-commits
commit: 18e0de0e6777e2210f505e3cc6640326cba799e1
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 11 01:25:07 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 14:22:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e0de0e
dev-db/mydumper: use a real patch to fix ignored CFLAGS
Using seds just ended up nastily failing to do anything:
* SED: the following did not cause any changes
* sed -i -e 's|-O3 -g -Werror|${CMAKE_C_FLAGS}|' CMakeLists.txt || die;
* no-op: -e s|-O3 -g -Werror|${CMAKE_C_FLAGS}|
But patch files are reliable since they will die if they don't apply
anymore.
Closes: https://bugs.gentoo.org/894494
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...per-0.14-Do-not-overwrite-the-user-CFLAGS.patch | 29 ++++++++++++++++++++++
...per-0.15-Do-not-overwrite-the-user-CFLAGS.patch | 25 +++++++++++++++++++
dev-db/mydumper/mydumper-0.14.5.2.ebuild | 7 +++---
dev-db/mydumper/mydumper-0.15.2.8.ebuild | 5 ++--
4 files changed, 59 insertions(+), 7 deletions(-)
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..844529b624db 100644
--- a/dev-db/mydumper/mydumper-0.14.5.2.ebuild
+++ b/dev-db/mydumper/mydumper-0.14.5.2.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
@@ -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
diff --git a/dev-db/mydumper/mydumper-0.15.2.8.ebuild b/dev-db/mydumper/mydumper-0.15.2.8.ebuild
index 1a99e5e9f244..49dc02ff90ea 100644
--- a/dev-db/mydumper/mydumper-0.15.2.8.ebuild
+++ b/dev-db/mydumper/mydumper-0.15.2.8.ebuild
@@ -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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/, dev-db/mydumper/files/
@ 2024-07-09 21:35 Eli Schwartz
0 siblings, 0 replies; 6+ messages in thread
From: Eli Schwartz @ 2024-07-09 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 4851cd949a3f4cd8f97289f48045194f791a11c6
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sun Jul 7 20:52:02 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Jul 9 21:33:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4851cd94
dev-db/mydumper: Fix implicit declaration of function open
Closes: https://bugs.gentoo.org/935389
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37448
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
.../files/mydumper-0.15-fix-call-to-open.patch | 42 ++++++++++++++++
dev-db/mydumper/mydumper-0.15.2.8-r1.ebuild | 57 ++++++++++++++++++++++
2 files changed, 99 insertions(+)
diff --git a/dev-db/mydumper/files/mydumper-0.15-fix-call-to-open.patch b/dev-db/mydumper/files/mydumper-0.15-fix-call-to-open.patch
new file mode 100644
index 000000000000..46c7f6aea8c5
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-0.15-fix-call-to-open.patch
@@ -0,0 +1,42 @@
+From https://github.com/mydumper/mydumper/pull/1557
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sun, 7 Jul 2024 20:40:30 +0000
+Subject: [PATCH] Fix building on musl libc
+
+On musl libc we are getting buid errors:
+mydumper/src/mydumper_stream.c:100:9: error: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-
+function-declaration]
+ 100 | f=open(sf->filename,O_RDONLY);
+ | ^~~~
+ | popen
+mydumper/src/mydumper_stream.c:100:27: error: 'O_RDONLY' undeclared (first use in this function)
+ 100 | f=open(sf->filename,O_RDONLY);
+ | ^~~~~~~~
+This probably due to musl being more strict. Fix was to include the
+fcntl.h header file as the Linux Manual Page suggests open should come
+from fcntl.h
+
+First reported on Gentoo Linux with musl profile
+
+Bug: https://bugs.gentoo.org/935389
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/src/mydumper_common.c
++++ b/src/mydumper_common.c
+@@ -20,6 +20,7 @@
+ */
+ #include "string.h"
+ #include <stdlib.h>
++#include <fcntl.h>
+ #include <mysql.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+--- a/src/mydumper_stream.c
++++ b/src/mydumper_stream.c
+@@ -26,6 +26,7 @@
+ #include "mydumper_stream.h"
+ #include <sys/file.h>
+ #include <errno.h>
++#include <fcntl.h>
+
+ extern GAsyncQueue *stream_queue;
+
diff --git a/dev-db/mydumper/mydumper-0.15.2.8-r1.ebuild b/dev-db/mydumper/mydumper-0.15.2.8-r1.ebuild
new file mode 100644
index 000000000000..388b59989451
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.15.2.8-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/mydumper/mydumper"
+SRC_URI="https://github.com/mydumper/mydumper/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="app-arch/zstd
+ dev-db/mysql-connector-c:=
+ dev-libs/glib:2
+ dev-libs/libpcre
+ dev-libs/openssl:=
+ sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ doc? ( dev-python/sphinx )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.13.1-atomic.patch" #654314
+
+ "${FILESDIR}"/${PN}-0.15-Do-not-overwrite-the-user-CFLAGS.patch
+
+ "${FILESDIR}"/${PN}-0.15-fix-call-to-open.patch
+)
+
+src_prepare() {
+ # fix doc install path
+ sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
+
+ cmake_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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/, dev-db/mydumper/files/
@ 2025-01-03 16:41 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2025-01-03 16:41 UTC (permalink / raw
To: gentoo-commits
commit: e19a2a10acbc09183aaf2729f6bf79762fb997ff
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Dec 3 13:34:44 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 3 16:32:08 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19a2a10
dev-db/mydumper: add 0.16.11.2
Adding USE=doc which is now in separate git repo:
https://github.com/mydumper/mydumper_docs
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39578
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-db/mydumper/Manifest | 2 +
.../mydumper/files/mydumper-0.16-cmake-docs.patch | 20 ++++++++
dev-db/mydumper/mydumper-0.16.11.2.ebuild | 57 ++++++++++++++++++++++
3 files changed, 79 insertions(+)
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index d55b1c17cf89..01a16d848182 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,2 +1,4 @@
DIST mydumper-0.15.2-8.tar.gz 186389 BLAKE2B 84e08fa6460a156771f598a8a0c98c79089490f9f2fe3b90fa49efd519e2270468fe86287bab03612006489a3a1d5ab2442e76cc0f4825c8df95acec30a1c4ba SHA512 f6ca5c5756944bd2704e8a25432db1fbe14ed2a1e88b549c0799c3e0c251e524523ed39797b0b2c15c9d65c0e6e5ce3d93a60a17c77090732a8f909ab24a0126
+DIST mydumper-0.16.11-2.tar.gz 192249 BLAKE2B 5e3a79d38fd6a346804d1b3b0edd60da13a031abc5d7b6cc5a0b1ea625af3979bc134b3946acc9228f4f0cba3583912c6d2a52bba9552ef65d374646ee335334 SHA512 4cb9272be1c13d31841fab928627f71868167e04f64e9742807326a1a2054b04fad2a65da2c5d703627cf760259760393bc8a8beca7066986c3a7af8cb1f181f
+DIST mydumper-0.16.11-2_docs.tar.gz 914231 BLAKE2B e9e163848a3b54317162fdb172b4f1d1daa867c2178f21ad61a597c4a3c7604a11a238874f2d208c7c702637318c63da1c12f040b64a57f572affb9a6af139c1 SHA512 af72d87b7460ebc37d72d2b368c8c296e42dc3bbb1ee517566cb9e10564bb81d0ec3eaf57fe1adb524f33bd152634e9fa8b0fd74e8da38e6de490fd8936ed967
DIST mydumper-0.16.7-5.tar.gz 192080 BLAKE2B dac0d0700ad7a68b3bffdb13f6cb674e75b868715822ef791eb00d64ce4a41335b5f54fc4a166ee527356a4f4c5311c01aabb1c8e0c91d964b4bca5b30a546c0 SHA512 ab7f06557814318352b1a511ff06f9e094dac43d3d5638977074aa8a79c3a9b83114aa15fcafcd0a39945a8c497c725b0a8221759d55aedb424eb048f10653d8
diff --git a/dev-db/mydumper/files/mydumper-0.16-cmake-docs.patch b/dev-db/mydumper/files/mydumper-0.16-cmake-docs.patch
new file mode 100644
index 000000000000..0b88b61bbfc4
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-0.16-cmake-docs.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8f1c9ad..a62195b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,11 @@ if (NOT MYSQL_FOUND)
+ MESSAGE(FATAL_ERROR "Could not find MySQL or MariaDB client libraries")
+ endif ()
+
+-#option(BUILD_DOCS "Build the documentation" ON)
++option(BUILD_DOCS "Build the documentation" ON)
+
+-#if (BUILD_DOCS)
+-# add_subdirectory(docs)
+-#endif (BUILD_DOCS)
++if (BUILD_DOCS)
++ add_subdirectory(docs)
++endif (BUILD_DOCS)
+
+ if (PC_GLIB2_VERSION VERSION_GREATER "2.51")
+ option(WITH_GLIB_uuid_string_random "uuid_string_random not available" ON)
diff --git a/dev-db/mydumper/mydumper-0.16.11.2.ebuild b/dev-db/mydumper/mydumper-0.16.11.2.ebuild
new file mode 100644
index 000000000000..d56bbf78a740
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.16.11.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+DOCS_COMMIT="c3eea3ce006292a2656f4bc9390a7f629abcbeee"
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/mydumper/mydumper"
+SRC_URI="https://github.com/mydumper/mydumper/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz
+ https://github.com/mydumper/mydumper_docs/archive/${DOCS_COMMIT}.tar.gz -> ${MY_P}_docs.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+ app-arch/zstd
+ dev-db/mysql-connector-c:=
+ dev-libs/glib:2
+ dev-libs/libpcre
+ dev-libs/openssl:=
+ sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( dev-python/furo )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.13.1-atomic.patch" #654314
+ "${FILESDIR}/${PN}-0.15-Do-not-overwrite-the-user-CFLAGS.patch"
+ "${FILESDIR}/${PN}-0.16-cmake-docs.patch"
+)
+
+src_prepare() {
+ # copy in docs
+ rm -rv ${WORKDIR}/${MY_P}/docs || die
+ mv -v "${WORKDIR}/${PN}_docs-${DOCS_COMMIT}" "${WORKDIR}/${MY_P}/docs" || die
+
+ # fix doc install path
+ sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(-DBUILD_DOCS=$(usex doc))
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/, dev-db/mydumper/files/
@ 2025-03-10 2:28 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-03-10 2:28 UTC (permalink / raw
To: gentoo-commits
commit: dbf6bb95317e8f01fd41de757f5a039a91f0cbfe
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Feb 28 14:34:11 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 02:26:41 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf6bb95
dev-db/mydumper: add 0.18.1.1
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/mydumper/Manifest | 2 +
...per-0.18-Do-not-overwrite-the-user-CFLAGS.patch | 13 +++++
dev-db/mydumper/mydumper-0.18.1.1.ebuild | 63 ++++++++++++++++++++++
3 files changed, 78 insertions(+)
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 01a16d848182..97668a0d635a 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -2,3 +2,5 @@ DIST mydumper-0.15.2-8.tar.gz 186389 BLAKE2B 84e08fa6460a156771f598a8a0c98c79089
DIST mydumper-0.16.11-2.tar.gz 192249 BLAKE2B 5e3a79d38fd6a346804d1b3b0edd60da13a031abc5d7b6cc5a0b1ea625af3979bc134b3946acc9228f4f0cba3583912c6d2a52bba9552ef65d374646ee335334 SHA512 4cb9272be1c13d31841fab928627f71868167e04f64e9742807326a1a2054b04fad2a65da2c5d703627cf760259760393bc8a8beca7066986c3a7af8cb1f181f
DIST mydumper-0.16.11-2_docs.tar.gz 914231 BLAKE2B e9e163848a3b54317162fdb172b4f1d1daa867c2178f21ad61a597c4a3c7604a11a238874f2d208c7c702637318c63da1c12f040b64a57f572affb9a6af139c1 SHA512 af72d87b7460ebc37d72d2b368c8c296e42dc3bbb1ee517566cb9e10564bb81d0ec3eaf57fe1adb524f33bd152634e9fa8b0fd74e8da38e6de490fd8936ed967
DIST mydumper-0.16.7-5.tar.gz 192080 BLAKE2B dac0d0700ad7a68b3bffdb13f6cb674e75b868715822ef791eb00d64ce4a41335b5f54fc4a166ee527356a4f4c5311c01aabb1c8e0c91d964b4bca5b30a546c0 SHA512 ab7f06557814318352b1a511ff06f9e094dac43d3d5638977074aa8a79c3a9b83114aa15fcafcd0a39945a8c497c725b0a8221759d55aedb424eb048f10653d8
+DIST mydumper-0.18.1-1.tar.gz 199785 BLAKE2B a21404e73ae7b992c53371512015d50056bef68b3920e3e9131995be918965e7410f2901cb049addee52b044e110373ee98239eb6962516c416ae1ec26f54449 SHA512 41fede2070986cc8c8e713613f081b4041cf4c4be2973fdc3a733540e1c741e9831e29e9300bdeef76f543743093def6b0af459c0cd69fa518972a1d7922cff4
+DIST mydumper-0.18.1-1_docs.tar.gz 943632 BLAKE2B 9e0879b092a1ce1073751c3d3174bce812cfb35ff4e3a58846ca61cc7655c84d426e68b32f2091a4788a796d7e5fb80abcaa07c5c5fed9317faf5dabaa1c59b5 SHA512 0df911f03a97ca6b5bc65ccea3bedae36a94690e7b53f9014972e860af37c8b7814832a9759cf91f642770452e2016e3ae3fd8dd0852108727f491e5f9d22cd1
diff --git a/dev-db/mydumper/files/mydumper-0.18-Do-not-overwrite-the-user-CFLAGS.patch b/dev-db/mydumper/files/mydumper-0.18-Do-not-overwrite-the-user-CFLAGS.patch
new file mode 100644
index 000000000000..3747d5dda73c
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-0.18-Do-not-overwrite-the-user-CFLAGS.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3fa5fde..c115b6e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,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 -Wno-strict-aliasing -Wextra -Wshadow -g -Werror ${MYSQL_CFLAGS}")
+ include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} )
+
+ OPTION(WITH_ASAN "Build with ASAN" OFF)
diff --git a/dev-db/mydumper/mydumper-0.18.1.1.ebuild b/dev-db/mydumper/mydumper-0.18.1.1.ebuild
new file mode 100644
index 000000000000..fb8e1465300f
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.18.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+DOCS_COMMIT="b260deb19d8cf88a5e57abc0d271673a4bea254d"
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/mydumper/mydumper"
+SRC_URI="https://github.com/mydumper/mydumper/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz
+ https://github.com/mydumper/mydumper_docs/archive/${DOCS_COMMIT}.tar.gz -> ${MY_P}_docs.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+ app-arch/zstd
+ dev-db/mysql-connector-c:=
+ dev-libs/glib:2
+ dev-libs/libpcre
+ dev-libs/openssl:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ dev-python/furo
+ dev-python/sphinx-inline-tabs
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.13.1-atomic.patch" #654314
+ "${FILESDIR}/${PN}-0.18-Do-not-overwrite-the-user-CFLAGS.patch"
+ "${FILESDIR}/${PN}-0.16-cmake-docs.patch"
+)
+
+src_prepare() {
+ # copy in docs
+ rm -rv "${WORKDIR}"/"${MY_P}"/docs || die
+ mv -v "${WORKDIR}/${PN}_docs-${DOCS_COMMIT}" "${WORKDIR}/${MY_P}/docs" || die
+
+ # https://pypi.org/project/sphinx-copybutton/ not yet in Gentoo
+ sed -i "s/'sphinx_copybutton',//g" "${WORKDIR}/${MY_P}/docs/_build/conf.py.in" || die
+
+ # fix doc install path
+ sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(-DBUILD_DOCS=$(usex doc))
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-03-10 2:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-10 2:28 [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/, dev-db/mydumper/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-01-03 16:41 Joonas Niilola
2024-07-09 21:35 Eli Schwartz
2024-03-11 14:24 Sam James
2023-02-15 5:53 Sam James
2021-05-28 19:23 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox