Tue May 12 19:44:27 2020 UTC ()
databases/mysql56-client: allow no-op SUBST block

In an unprivileged bulk build on NetBSD 8.0, the WRAPPER_BINDIR was not
found in the file.  Maybe there are other systems that need it.


(rillig)
diff -r1.55 -r1.56 pkgsrc/databases/mysql56-client/Makefile.common
cvs diff -r1.55 -r1.56 pkgsrc/databases/mysql56-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2020/03/22 20:12:14 1.55
+++ pkgsrc/databases/mysql56-client/Makefile.common 2020/05/12 19:44:27 1.56
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.55 2020/03/22 20:12:14 rillig Exp $ 1# $NetBSD: Makefile.common,v 1.56 2020/05/12 19:44:27 rillig Exp $
2# 2#
3# used by databases/mysql56-client/Makefile 3# used by databases/mysql56-client/Makefile
4# used by databases/mysql56-server/Makefile 4# used by databases/mysql56-server/Makefile
5 5
6DISTNAME= mysql-5.6.47 6DISTNAME= mysql-5.6.47
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/}
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/mysql56-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo
@@ -115,26 +115,27 @@ SUBST_FILES.scr+= scripts/mysqld_safe.sh @@ -115,26 +115,27 @@ SUBST_FILES.scr+= scripts/mysqld_safe.sh
115SUBST_FILES.scr+= support-files/mysql.server.sh 115SUBST_FILES.scr+= support-files/mysql.server.sh
116SUBST_SED.scr= -e "s,chown,${CHOWN},g" 116SUBST_SED.scr= -e "s,chown,${CHOWN},g"
117SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 117SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
118SUBST_SED.scr+= -e "s,@SHELL_PATH@,${RCD_SCRIPTS_SHELL},g" 118SUBST_SED.scr+= -e "s,@SHELL_PATH@,${RCD_SCRIPTS_SHELL},g"
119SUBST_MESSAGE.scr= Fixing scripts. 119SUBST_MESSAGE.scr= Fixing scripts.
120SUBST_NOOP_OK.scr= yes # since RCD_SCRIPTS_SHELL may be /bin/sh 120SUBST_NOOP_OK.scr= yes # since RCD_SCRIPTS_SHELL may be /bin/sh
121 121
122SUBST_CLASSES+= fixpaths 122SUBST_CLASSES+= fixpaths
123SUBST_STAGE.fixpaths= post-install 123SUBST_STAGE.fixpaths= post-install
124SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug 124SUBST_FILES.fixpaths= ${DESTDIR}${PREFIX}/bin/mysqlbug
125SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN 125SUBST_FILES.fixpaths+= ${DESTDIR}${PREFIX}/share/doc/mysql/INFO_BIN
126SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g" 126SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g"
127SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g" 127SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g"
 128SUBST_NOOP_OK.fixpaths= yes # not needed for mysql-client-5.6.47 on NetBSD
128 129
129# Don't use the base system "libedit" under NetBSD because MySQL expects 130# Don't use the base system "libedit" under NetBSD because MySQL expects
130# an incompatible prototype for "rl_completion_entry_function". 131# an incompatible prototype for "rl_completion_entry_function".
131.if ${OPSYS} == "NetBSD" 132.if ${OPSYS} == "NetBSD"
132USE_BUILTIN.editline= no 133USE_BUILTIN.editline= no
133.endif 134.endif
134 135
135.include "../../mk/readline.buildlink3.mk" 136.include "../../mk/readline.buildlink3.mk"
136.if ${READLINE_TYPE} == "readline" 137.if ${READLINE_TYPE} == "readline"
137CMAKE_ARGS+= -DWITH_READLINE="system" 138CMAKE_ARGS+= -DWITH_READLINE="system"
138.else 139.else
139CMAKE_ARGS+= -DWITH_EDITLINE="system" 140CMAKE_ARGS+= -DWITH_EDITLINE="system"
140.endif 141.endif