From 732e973d1200206c9608ea84598f8dcfb78e051e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Thu, 24 Jul 2025 09:59:19 +0200 Subject: [PATCH] dev-db/mydumper: correct the CFLAGS related patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch was incorrectly rebased/transformed from the original in commit dbf6bb95317e ("dev-db/mydumper: add 0.18.1.1") and the "-g -Werror" flags were not removed. This commit fixes the patch and restores authorship. Closes: https://bugs.gentoo.org/960600 Signed-off-by: Petr Vaněk --- ...r-0.18-Do-not-overwrite-the-user-CFLAGS.patch | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) 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 index 3747d5dda73c6..7fc6159885380 100644 --- 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 @@ -1,5 +1,14 @@ +From 846fa909ce6f36df5939927d56d3d0e366770cd6 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +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 3fa5fde..c115b6e 100644 +index 3fa5fde3..f5b9e96d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ if (MARIADB_FOUND AND NOT MARIADB_SSL AND WITH_SSL) @@ -7,7 +16,10 @@ index 3fa5fde..c115b6e 100644 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}") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow ${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) +-- +2.50.1 +