summaryrefslogtreecommitdiff
path: root/mk/configure
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-10-13 10:10:05 +0000
committerwiz <wiz@pkgsrc.org>2013-10-13 10:10:05 +0000
commit21adcec9d174a5c2bb130d4f23e9fa5dc4ff411b (patch)
treeae9bc6f8f4e0e29c0adf8e4624188450ccc8abcd /mk/configure
parent577e303f4e7b07a8f02692c67607dfda638755c5 (diff)
downloadpkgsrc-21adcec9d174a5c2bb130d4f23e9fa5dc4ff411b.tar.gz
Remove config.rpath override file and related code.
This file is from libtool-1.x, which is not in pkgsrc any longer (using libtool-2.x since 2009). Also, it was only used for packages using autoconf-2.13 AND libtool; I found three packages in pkgsrc with that combination, and all of them still build on NetBSD-6.99.24/amd64 after this change.
Diffstat (limited to 'mk/configure')
-rw-r--r--mk/configure/config-override.mk17
1 files changed, 6 insertions, 11 deletions
diff --git a/mk/configure/config-override.mk b/mk/configure/config-override.mk
index e3ee5286977..cce85e9f882 100644
--- a/mk/configure/config-override.mk
+++ b/mk/configure/config-override.mk
@@ -1,27 +1,22 @@
-# $NetBSD: config-override.mk,v 1.6 2008/02/07 21:36:13 rillig Exp $
+# $NetBSD: config-override.mk,v 1.7 2013/10/13 10:10:05 wiz Exp $
######################################################################
-### config-{guess,sub,rpath}-override (PRIVATE)
+### config-{guess,sub}-override (PRIVATE)
######################################################################
-### config-{guess,sub,rpath}-override replace any existing config.guess,
-### config.sub, and config-rpath under ${WRKSRC} with the specially-kept
-### versions under pkgsrc/mk/gnu-config.
+### config-{guess,sub}-override replace any existing config.guess and
+### config.sub under ${WRKSRC} with the specially-kept versions
+### under pkgsrc/mk/gnu-config.
###
do-configure-pre-hook: config-guess-override
do-configure-pre-hook: config-sub-override
-.if defined(CONFIG_RPATH_OVERRIDE)
-do-configure-pre-hook: config-rpath-override
-.endif
_OVERRIDE_VAR.guess= CONFIG_GUESS_OVERRIDE
_OVERRIDE_VAR.sub= CONFIG_SUB_OVERRIDE
-_OVERRIDE_VAR.rpath= CONFIG_RPATH_OVERRIDE
OVERRIDE_DIRDEPTH.config-guess?= ${OVERRIDE_DIRDEPTH}
OVERRIDE_DIRDEPTH.config-sub?= ${OVERRIDE_DIRDEPTH}
-OVERRIDE_DIRDEPTH.config-rpath?= ${OVERRIDE_DIRDEPTH}
-.for _sub_ in guess sub rpath
+.for _sub_ in guess sub
_SCRIPT.config-${_sub_}-override= \
${RM} -f $$file; \
${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.${_sub_} $$file