summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-01-19 15:04:05 +0000
committerjlam <jlam@pkgsrc.org>2004-01-19 15:04:05 +0000
commitcebb84d3d5057c41c397d735a4121c53caa35ae2 (patch)
treeca6d95e6ce36ab1a3aa385e8fa3227a359ac263a
parent69bbf64eeb0009819bca6484b25e360e27e0fa2a (diff)
downloadpkgsrc-cebb84d3d5057c41c397d735a4121c53caa35ae2.tar.gz
Allow CONFIG_STATUS_OVERRIDE to override config.status scripts generated
by GNU configure scripts at CONFIGURE_POSTREQ time. The new config.status scripts merely return success. This prevents newer Makefiles from re-running the configure script with the wrong shell environment if we've touched some GNU autotool-related files during the patch stage. We might want to always do this, i.e. make this opt-out instead of opt-in. However, we start with opt-in so that no existing packages can break.
-rw-r--r--mk/bsd.pkg.mk16
1 files changed, 15 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 96510b53e1c..fb8e98dd7a8 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1347 2004/01/19 14:54:26 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1348 2004/01/19 15:04:05 jlam Exp $
#
# This file is in the public domain.
#
@@ -2401,6 +2401,20 @@ do-libtool-override:
. endif
.endif
+.if defined(CONFIG_STATUS_OVERRIDE)
+_CONFIGURE_POSTREQ+= do-config-status-override
+.PHONY: do-config-status-override
+do-config-status-override:
+. for file in ${CONFIG_STATUS_OVERRIDE}
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ if [ -f ${file} ]; then \
+ ${RM} -f ${file}; \
+ ( ${ECHO} '#!${SH}'; ${ECHO} 'exit 0' ) > ${file}; \
+ ${CHMOD} +x ${file}; \
+ fi
+. endfor
+.endif
+
.PHONY: post-configure
post-configure: ${_CONFIGURE_POSTREQ}