Skip to content

Commit 828299c

Browse files
committed
mariadb*: cmake does not CPPFLAGS
1 parent 006166e commit 828299c

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

databases/mariadb104-client/Makefile.common

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile.common,v 1.7 2021/05/25 11:18:25 jperkin Exp $
1+
# $NetBSD: Makefile.common,v 1.8 2021/05/30 16:33:29 nia Exp $
22
#
33
# used by databases/mariadb104-client/Makefile
44
# used by databases/mariadb104-server/Makefile
@@ -83,9 +83,7 @@ CMAKE_ARGS+= -DTOKUDB_OK=OFF
8383
CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
8484
.endif
8585

86-
CPPFLAGS.NetBSD+= -D_NETBSD_SOURCE
87-
88-
CPPFLAGS.SunOS+= -fPIC
86+
CFLAGS.SunOS+= -fPIC
8987

9088
REPLACE_PERL+= scripts/mytop.sh
9189
REPLACE_PERL+= sql-bench/*.sh
@@ -107,4 +105,5 @@ PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in
107105
.include "../../mk/curses.buildlink3.mk"
108106
.include "../../mk/dlopen.buildlink3.mk"
109107
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
108+
.include "../../mk/readline.buildlink3.mk"
110109
.include "../../mk/krb5.buildlink3.mk"

databases/mariadb105-client/Makefile.common

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile.common,v 1.4 2021/05/25 11:18:26 jperkin Exp $
1+
# $NetBSD: Makefile.common,v 1.5 2021/05/30 16:33:30 nia Exp $
22
#
33
# used by databases/mariadb105-client/Makefile
44
# used by databases/mariadb105-server/Makefile
@@ -84,9 +84,7 @@ CMAKE_ARGS+= -DTOKUDB_OK=OFF
8484
CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
8585
.endif
8686

87-
CPPFLAGS.NetBSD+= -D_NETBSD_SOURCE
88-
89-
CPPFLAGS.SunOS+= -fPIC
87+
CFLAGS.SunOS+= -fPIC
9088

9189
REPLACE_PERL+= scripts/mytop.sh
9290
REPLACE_PERL+= sql-bench/*.sh

0 commit comments

Comments
 (0)