Sun May 30 16:33:30 2021 UTC ()
mariadb*: cmake does not CPPFLAGS


(nia)
diff -r1.7 -r1.8 pkgsrc/databases/mariadb104-client/Makefile.common
diff -r1.4 -r1.5 pkgsrc/databases/mariadb105-client/Makefile.common
cvs diff -r1.7 -r1.8 pkgsrc/databases/mariadb104-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mariadb104-client/Makefile.common 2021/05/25 11:18:25 1.7
+++ pkgsrc/databases/mariadb104-client/Makefile.common 2021/05/30 16:33:29 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
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 $
2# 2#
3# used by databases/mariadb104-client/Makefile 3# used by databases/mariadb104-client/Makefile
4# used by databases/mariadb104-server/Makefile 4# used by databases/mariadb104-server/Makefile
5 5
6DISTNAME= mariadb-10.4.18 6DISTNAME= mariadb-10.4.18
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/ 8MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/
9MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/ 9MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/
10 10
11MAINTAINER?= pkgsrc-users@NetBSD.org 11MAINTAINER?= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://mariadb.org/ 12HOMEPAGE= https://mariadb.org/
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -73,38 +73,37 @@ CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_E @@ -73,38 +73,37 @@ CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_E
73CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON 73CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
74 74
75CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON 75CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
76 76
77CMAKE_ARGS+= -DENABLE_DTRACE=OFF 77CMAKE_ARGS+= -DENABLE_DTRACE=OFF
78 78
79CMAKE_ARGS+= -DTOKUDB_OK=OFF 79CMAKE_ARGS+= -DTOKUDB_OK=OFF
80 80
81# Ensure the correct DTrace ABI is used. 81# Ensure the correct DTrace ABI is used.
82.if !empty(ABI) 82.if !empty(ABI)
83CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" 83CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
84.endif 84.endif
85 85
86CPPFLAGS.NetBSD+= -D_NETBSD_SOURCE 86CFLAGS.SunOS+= -fPIC
87 
88CPPFLAGS.SunOS+= -fPIC 
89 87
90REPLACE_PERL+= scripts/mytop.sh 88REPLACE_PERL+= scripts/mytop.sh
91REPLACE_PERL+= sql-bench/*.sh 89REPLACE_PERL+= sql-bench/*.sh
92 90
93SUBST_CLASSES+= perl 91SUBST_CLASSES+= perl
94SUBST_STAGE.perl= pre-configure 92SUBST_STAGE.perl= pre-configure
95SUBST_FILES.perl= scripts/CMakeLists.txt 93SUBST_FILES.perl= scripts/CMakeLists.txt
96SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g" 94SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g"
97SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g" 95SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g"
98 96
99CHECK_INTERPRETER_SKIP+= share/mysql/test/* 97CHECK_INTERPRETER_SKIP+= share/mysql/test/*
100CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov 98CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov
101 99
102PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in 100PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in
103PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in 101PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in
104 102
105.include "../../devel/zlib/buildlink3.mk" 103.include "../../devel/zlib/buildlink3.mk"
106.include "../../www/curl/buildlink3.mk" 104.include "../../www/curl/buildlink3.mk"
107.include "../../mk/curses.buildlink3.mk" 105.include "../../mk/curses.buildlink3.mk"
108.include "../../mk/dlopen.buildlink3.mk" 106.include "../../mk/dlopen.buildlink3.mk"
109BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 107BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 108.include "../../mk/readline.buildlink3.mk"
110.include "../../mk/krb5.buildlink3.mk" 109.include "../../mk/krb5.buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/databases/mariadb105-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mariadb105-client/Makefile.common 2021/05/25 11:18:26 1.4
+++ pkgsrc/databases/mariadb105-client/Makefile.common 2021/05/30 16:33:30 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
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 $
2# 2#
3# used by databases/mariadb105-client/Makefile 3# used by databases/mariadb105-client/Makefile
4# used by databases/mariadb105-server/Makefile 4# used by databases/mariadb105-server/Makefile
5 5
6DISTNAME= mariadb-10.5.10 6DISTNAME= mariadb-10.5.10
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/ 8MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/
9MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/ 9MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/
10 10
11MAINTAINER?= pkgsrc-users@NetBSD.org 11MAINTAINER?= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://mariadb.org/ 12HOMEPAGE= https://mariadb.org/
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -74,29 +74,27 @@ CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_E @@ -74,29 +74,27 @@ CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_E
74CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON 74CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON
75 75
76CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON 76CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
77 77
78CMAKE_ARGS+= -DENABLE_DTRACE=OFF 78CMAKE_ARGS+= -DENABLE_DTRACE=OFF
79 79
80CMAKE_ARGS+= -DTOKUDB_OK=OFF 80CMAKE_ARGS+= -DTOKUDB_OK=OFF
81 81
82# Ensure the correct DTrace ABI is used. 82# Ensure the correct DTrace ABI is used.
83.if !empty(ABI) 83.if !empty(ABI)
84CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" 84CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
85.endif 85.endif
86 86
87CPPFLAGS.NetBSD+= -D_NETBSD_SOURCE 87CFLAGS.SunOS+= -fPIC
88 
89CPPFLAGS.SunOS+= -fPIC 
90 88
91REPLACE_PERL+= scripts/mytop.sh 89REPLACE_PERL+= scripts/mytop.sh
92REPLACE_PERL+= sql-bench/*.sh 90REPLACE_PERL+= sql-bench/*.sh
93 91
94SUBST_CLASSES+= perl 92SUBST_CLASSES+= perl
95SUBST_STAGE.perl= pre-configure 93SUBST_STAGE.perl= pre-configure
96SUBST_FILES.perl= scripts/CMakeLists.txt 94SUBST_FILES.perl= scripts/CMakeLists.txt
97SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g" 95SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g"
98SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g" 96SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g"
99 97
100CHECK_INTERPRETER_SKIP+= share/mysql/test/* 98CHECK_INTERPRETER_SKIP+= share/mysql/test/*
101CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/cloud/*.sh.in 99CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/cloud/*.sh.in
102CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov 100CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov