Sun Mar 22 20:23:52 2020 UTC ()
databases/mysql57-client: allow SUBST class to be a no-op


(rillig)
diff -r1.23 -r1.24 pkgsrc/databases/mysql57-client/Makefile.common
cvs diff -r1.23 -r1.24 pkgsrc/databases/mysql57-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/Makefile.common 2020/03/17 18:33:08 1.23
+++ pkgsrc/databases/mysql57-client/Makefile.common 2020/03/22 20:23:52 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.23 2020/03/17 18:33:08 adam Exp $ 1# $NetBSD: Makefile.common,v 1.24 2020/03/22 20:23:52 rillig Exp $
2# 2#
3# used by databases/mysql57-client/Makefile 3# used by databases/mysql57-client/Makefile
4# used by databases/mysql57-server/Makefile 4# used by databases/mysql57-server/Makefile
5 5
6DISTNAME= mysql-5.7.29 6DISTNAME= mysql-5.7.29
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.mysql.com/ 11HOMEPAGE= https://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql57-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql57-client/distinfo
@@ -105,26 +105,27 @@ CFLAGS+= -DSIGNALS_DONT_BREAK_READ @@ -105,26 +105,27 @@ CFLAGS+= -DSIGNALS_DONT_BREAK_READ
105CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 105CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
106.endif 106.endif
107 107
108LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 108LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
109 109
110SUBST_CLASSES+= scr 110SUBST_CLASSES+= scr
111SUBST_STAGE.scr= pre-configure 111SUBST_STAGE.scr= pre-configure
112SUBST_FILES.scr= scripts/mysqld_safe.sh 112SUBST_FILES.scr= scripts/mysqld_safe.sh
113SUBST_FILES.scr+= support-files/mysql.server.sh 113SUBST_FILES.scr+= support-files/mysql.server.sh
114SUBST_SED.scr= -e "s,chown,${CHOWN},g" 114SUBST_SED.scr= -e "s,chown,${CHOWN},g"
115SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 115SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
116SUBST_SED.scr+= -e "s,@SHELL_PATH@,${RCD_SCRIPTS_SHELL},g" 116SUBST_SED.scr+= -e "s,@SHELL_PATH@,${RCD_SCRIPTS_SHELL},g"
117SUBST_MESSAGE.scr= Fixing scripts. 117SUBST_MESSAGE.scr= Fixing scripts.
 118SUBST_NOOP_OK.scr= yes # since RCD_SCRIPTS_SHELL may be /bin/sh
118 119
119# Don't use the base system "libedit" under NetBSD because MySQL expects 120# Don't use the base system "libedit" under NetBSD because MySQL expects
120# an incompatible prototype for "rl_completion_entry_function". 121# an incompatible prototype for "rl_completion_entry_function".
121.if ${OPSYS} == "NetBSD" 122.if ${OPSYS} == "NetBSD"
122USE_BUILTIN.editline= no 123USE_BUILTIN.editline= no
123.endif 124.endif
124 125
125.include "../../mk/readline.buildlink3.mk" 126.include "../../mk/readline.buildlink3.mk"
126.if ${READLINE_TYPE} == "readline" 127.if ${READLINE_TYPE} == "readline"
127CMAKE_ARGS+= -DWITH_READLINE="system" 128CMAKE_ARGS+= -DWITH_READLINE="system"
128.else 129.else
129CMAKE_ARGS+= -DWITH_EDITLINE="system" 130CMAKE_ARGS+= -DWITH_EDITLINE="system"
130.endif 131.endif