CVS commit: pkgsrc/databases

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun May 30 16:33:30 UTC 2021

Modified Files:
        pkgsrc/databases/mariadb104-client: Makefile.common
        pkgsrc/databases/mariadb105-client: Makefile.common

Log Message:
mariadb*: cmake does not CPPFLAGS


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb104-client/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb105-client/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb104-client/Makefile.common
diff -u pkgsrc/databases/mariadb104-client/Makefile.common:1.7 pkgsrc/databases/mariadb104-client/Makefile.common:1.8
--- pkgsrc/databases/mariadb104-client/Makefile.common:1.7      Tue May 25 11:18:25 2021
+++ pkgsrc/databases/mariadb104-client/Makefile.common  Sun May 30 16:33:29 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2021/05/25 11:18:25 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2021/05/30 16:33:29 nia Exp $
 #
 # used by databases/mariadb104-client/Makefile
 # used by databases/mariadb104-server/Makefile
@@ -83,9 +83,7 @@ CMAKE_ARGS+=          -DTOKUDB_OK=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
-CPPFLAGS.NetBSD+=      -D_NETBSD_SOURCE
-
-CPPFLAGS.SunOS+=       -fPIC
+CFLAGS.SunOS+=         -fPIC
 
 REPLACE_PERL+=         scripts/mytop.sh
 REPLACE_PERL+=         sql-bench/*.sh
@@ -107,4 +105,5 @@ PKGCONFIG_OVERRIDE+=        libmariadb/mariadb_
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"

Index: pkgsrc/databases/mariadb105-client/Makefile.common
diff -u pkgsrc/databases/mariadb105-client/Makefile.common:1.4 pkgsrc/databases/mariadb105-client/Makefile.common:1.5
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.4      Tue May 25 11:18:26 2021
+++ pkgsrc/databases/mariadb105-client/Makefile.common  Sun May 30 16:33:30 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2021/05/25 11:18:26 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.5 2021/05/30 16:33:30 nia Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
@@ -84,9 +84,7 @@ CMAKE_ARGS+=          -DTOKUDB_OK=OFF
 CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
 .endif
 
-CPPFLAGS.NetBSD+=      -D_NETBSD_SOURCE
-
-CPPFLAGS.SunOS+=       -fPIC
+CFLAGS.SunOS+=         -fPIC
 
 REPLACE_PERL+=         scripts/mytop.sh
 REPLACE_PERL+=         sql-bench/*.sh