tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

allow OVERRIDE_GNU_CONFIG_SCRIPTS=no



As per PR 53958 OVERRIDE_GNU_CONFIG_SCRIPTS cannot currently be turned
off, because it's tested by defined/undefined and it's assigned right
before it's tested when GNU_CONFIGURE is in effect.

This patch makes it honor "no", like INSTALL_SH_OVERRIDE next to it.

I haven't tested the pkglint change yet but it appears to be what's
wanted. I assume if committed this should also bump the versions of
pkglint and pkglint4.

All five of the existing packages that refer to this variable set it
to "yes" so there's no need to change any of them.

   ------

Index: mk/configure/configure.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/configure/configure.mk,v
retrieving revision 1.26
diff -u -r1.26 configure.mk
--- mk/configure/configure.mk	30 Nov 2018 18:38:19 -0000	1.26
+++ mk/configure/configure.mk	11 Feb 2019 05:32:55 -0000
@@ -28,9 +28,10 @@
 #
 # OVERRIDE_GNU_CONFIG_SCRIPTS
 #	Whether to override the GNU config.guess and config.sub scripts
-#	with the pkgsrc versions.
+#	with the pkgsrc versions. If not defined or set to "no", then
+#	no files are overridden.
 #
-#	Possible values: defined, undefined.
+#	Possible values: no, defined, undefined.
 #
 #	Default value: defined when GNU_CONFIGURE is defined, undefined
 #	otherwise.
@@ -65,7 +66,8 @@
 .if defined(GNU_CONFIGURE)
 .  include "gnu-configure.mk"
 .endif
-.if defined(OVERRIDE_GNU_CONFIG_SCRIPTS)
+.if defined(OVERRIDE_GNU_CONFIG_SCRIPTS) && \
+	empty(OVERRIDE_GNU_CONFIG_SCRIPTS:M[Nn][Oo])
 .  include "config-override.mk"
 .endif
 .if defined(INSTALL_SH_OVERRIDE) && empty(INSTALL_SH_OVERRIDE:M[Nn][Oo])
Index: mk/configure/gnu-configure.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/configure/gnu-configure.mk,v
retrieving revision 1.17
diff -u -r1.17 gnu-configure.mk
--- mk/configure/gnu-configure.mk	23 Aug 2014 03:00:18 -0000	1.17
+++ mk/configure/gnu-configure.mk	11 Feb 2019 05:32:55 -0000
@@ -10,7 +10,7 @@
 	USE_GNU_CONFIGURE_HOST
 
 HAS_CONFIGURE=			defined
-OVERRIDE_GNU_CONFIG_SCRIPTS=	defined
+OVERRIDE_GNU_CONFIG_SCRIPTS?=	yes
 INSTALL_SH_OVERRIDE?=		# empty
 
 CONFIGURE_ENV+=	CONFIG_SHELL=${CONFIG_SHELL:Q}
Index: pkgtools/pkglint/files/vardefs.go
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/files/vardefs.go,v
retrieving revision 1.55
diff -u -r1.55 vardefs.go
--- pkgtools/pkglint/files/vardefs.go	26 Jan 2019 16:31:33 -0000	1.55
+++ pkgtools/pkglint/files/vardefs.go	11 Feb 2019 05:32:55 -0000
@@ -926,7 +926,7 @@
 	sysload("OS_VERSION", lkNone, BtVersion)
 	sysload("OSX_VERSION", lkNone, BtVersion) // See mk/platform/Darwin.mk.
 	pkg("OVERRIDE_DIRDEPTH*", lkNone, BtInteger)
-	pkg("OVERRIDE_GNU_CONFIG_SCRIPTS", lkNone, BtYes)
+	pkg("OVERRIDE_GNU_CONFIG_SCRIPTS", lkNone, BtYesNo)
 	acl("OWNER", lkNone, BtMailAddress, "Makefile: set; Makefile.common: default")
 	pkglist("OWN_DIRS", lkShell, BtPathname)
 	pkglist("OWN_DIRS_PERMS", lkShell, BtPerms)
Index: pkgtools/pkglint4/files/makevars.map
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint4/files/makevars.map,v
retrieving revision 1.9
diff -u -r1.9 makevars.map
--- pkgtools/pkglint4/files/makevars.map	21 May 2018 08:12:23 -0000	1.9
+++ pkgtools/pkglint4/files/makevars.map	11 Feb 2019 05:32:56 -0000
@@ -526,7 +526,7 @@
 OSVERSION_SPECIFIC	Yes [m:s,c:s]
 OS_VERSION		Version [$system]
 OVERRIDE_DIRDEPTH*	Integer [$package]
-OVERRIDE_GNU_CONFIG_SCRIPTS	Yes [$package]
+OVERRIDE_GNU_CONFIG_SCRIPTS	YesNo [$package]
 OWNER			Mail_Address [m:s,c:d]
 OWN_DIRS		List of Pathname [$package_list]
 OWN_DIRS_PERMS		List of ShellWord [$package_list]

-- 
David A. Holland
dholland%netbsd.org@localhost


Home | Main Index | Thread Index | Old Index