git: eb14b8fae3fe - main - databases/mysql*-{client, server}: Remove NDEBUG

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jochen Neumeister <joneum_at_FreeBSD.org>
Date: Mon, 05 Dec 2022 09:06:47 UTC
The branch main has been updated by joneum:

URL: https://cgit.FreeBSD.org/ports/commit/?id=eb14b8fae3fec7854e6d6ff217c14246d8a826f1

commit eb14b8fae3fec7854e6d6ff217c14246d8a826f1
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2022-12-05 09:01:13 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2022-12-05 09:06:03 +0000

    databases/mysql*-{client, server}: Remove NDEBUG
    
    As of 3c5189a0fd4c82addfb659024bf28c5006bf88f7 there shouldn't be a need
    to define NDEBUG by hand when using CMake.
    
    Reported by:    dizzy
    Sponsored by:   Netzkommune GmbH
---
 databases/mysql57-client/Makefile | 3 ---
 databases/mysql57-server/Makefile | 3 ---
 databases/mysql80-server/Makefile | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index a120e5012247..c1a312aafec8 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -20,9 +20,6 @@ CONFLICTS_INSTALL=	mysql5[0-68-9]-client \
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 \
 		-DWITH_NDBCLUSTER=1
 
-CFLAGS+=	-DNDEBUG
-CXXFLAGS+=	-DNDEBUG
-
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
 MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 2be6eeac5423..8a897ea7647b 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -33,9 +33,6 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
 
 CMAKE_BUILD_TYPE=	Release
 
-CFLAGS+=	-DNDEBUG
-CXXFLAGS+=	-DNDEBUG
-
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index f2ee53c9137c..7c2defec14e6 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -55,7 +55,7 @@ BUILD_DEPENDS_powerpc64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64le=	libunwind>0:devel/libunwind
 
 CMAKE_BUILD_TYPE=	Release
-CFLAGS+=		-fPIC -DNDEBUG -malign-double
+CFLAGS+=		-fPIC -malign-double
 CFLAGS_aarch64?=	-march=armv8-a+crc+crypto
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \