Thu Jan 12 19:37:35 2023 UTC ()
configure.mk: include cmake/configure-settings.mk

when using cmake/build.mk include cmake/configure-settings.mk where
USE_CMAKE would have included cmake.mk


(markd)
diff -r1.31 -r1.32 pkgsrc/mk/configure/configure.mk
cvs diff -r1.31 -r1.32 pkgsrc/mk/configure/configure.mk (expand / switch to unified diff)

--- pkgsrc/mk/configure/configure.mk 2020/02/23 20:24:46 1.31
+++ pkgsrc/mk/configure/configure.mk 2023/01/12 19:37:35 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: configure.mk,v 1.31 2020/02/23 20:24:46 rillig Exp $ 1# $NetBSD: configure.mk,v 1.32 2023/01/12 19:37:35 markd Exp $
2# 2#
3# = Package-settable variables = 3# = Package-settable variables =
4# 4#
5# CONFIGURE_ENV is the shell environment that is exported to the 5# CONFIGURE_ENV is the shell environment that is exported to the
6# configure script. 6# configure script.
7# 7#
8# CONFIG_SHELL is the shell that is used for interpreting the 8# CONFIG_SHELL is the shell that is used for interpreting the
9# configure script. 9# configure script.
10# 10#
11# CONFIGURE_SCRIPT is the path to the script to run in order to 11# CONFIGURE_SCRIPT is the path to the script to run in order to
12# configure the software for building. If the path is relative, 12# configure the software for building. If the path is relative,
13# then it is assumed to be relative to each directory listed in 13# then it is assumed to be relative to each directory listed in
14# CONFIGURE_DIRS. 14# CONFIGURE_DIRS.
@@ -75,26 +75,29 @@ _BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_A @@ -75,26 +75,29 @@ _BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_A
75.if defined(USE_LIBTOOL) 75.if defined(USE_LIBTOOL)
76. include "libtool-override.mk" 76. include "libtool-override.mk"
77.endif 77.endif
78.if defined(PKGCONFIG_OVERRIDE) 78.if defined(PKGCONFIG_OVERRIDE)
79. include "pkg-config-override.mk" 79. include "pkg-config-override.mk"
80.endif 80.endif
81.include "replace-interpreter.mk" 81.include "replace-interpreter.mk"
82.if defined(USE_PKGLOCALEDIR) 82.if defined(USE_PKGLOCALEDIR)
83. include "replace-localedir.mk" 83. include "replace-localedir.mk"
84.endif 84.endif
85.if defined(USE_CMAKE) 85.if defined(USE_CMAKE)
86. include "cmake.mk" 86. include "cmake.mk"
87.endif 87.endif
 88.if defined(_CMAKE_CONFIGURE_SETTINGS)
 89. include "../../devel/cmake/configure-settings.mk"
 90.endif
88 91
89###################################################################### 92######################################################################
90### configure (PUBLIC) 93### configure (PUBLIC)
91###################################################################### 94######################################################################
92### configure is a public target to configure the sources for building. 95### configure is a public target to configure the sources for building.
93### 96###
94_CONFIGURE_TARGETS+= check-vulnerable 97_CONFIGURE_TARGETS+= check-vulnerable
95_CONFIGURE_TARGETS+= wrapper 98_CONFIGURE_TARGETS+= wrapper
96_CONFIGURE_TARGETS+= acquire-configure-lock 99_CONFIGURE_TARGETS+= acquire-configure-lock
97_CONFIGURE_TARGETS+= ${_COOKIE.configure} 100_CONFIGURE_TARGETS+= ${_COOKIE.configure}
98_CONFIGURE_TARGETS+= release-configure-lock 101_CONFIGURE_TARGETS+= release-configure-lock
99 102
100.PHONY: configure 103.PHONY: configure