Skip to content

Commit

Permalink
Add override for uncommon "config.rpath" GNU config snippet. Use plat…
Browse files Browse the repository at this point in the history
…form

file to indicate that override logic should be turned on.  (AFAICT, only
Interix is afflicted at the moment.)
  • Loading branch information
tv committed Jan 14, 2005
1 parent 94d1e1b commit 6d20fd6
Show file tree
Hide file tree
Showing 3 changed files with 543 additions and 11 deletions.
31 changes: 21 additions & 10 deletions mk/bsd.pkg.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.1558 2005/01/13 20:19:57 tv Exp $
# $NetBSD: bsd.pkg.mk,v 1.1559 2005/01/14 00:10:01 tv Exp $
#
# This file is in the public domain.
#
Expand Down Expand Up @@ -1115,6 +1115,7 @@ CONFIG_GUESS_OVERRIDE?= \
config.guess */config.guess */*/config.guess
CONFIG_SUB_OVERRIDE?= \
config.sub */config.sub */*/config.sub
CONFIG_RPATH_OVERRIDE?= # set by platform file as needed
#
# By default, override config.status for GNU configure packages. We
# never want it to execute after the configure phase has ended as it
Expand Down Expand Up @@ -2265,12 +2266,11 @@ do-ltconfig-override:
. endfor
.endif

.if defined(CONFIG_GUESS_OVERRIDE) || defined(CONFIG_SUB_OVERRIDE)
_CONFIGURE_PREREQ+= do-config-star-override
.PHONY: do-config-star-override
do-config-star-override:
. if defined(CONFIG_GUESS_OVERRIDE) && !empty(CONFIG_GUESS_OVERRIDE)
. for _pattern_ in ${CONFIG_GUESS_OVERRIDE}
.if !empty(CONFIG_GUESS_OVERRIDE)
. for _pattern_ in ${CONFIG_GUESS_OVERRIDE}
${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
for file in ${_pattern_}; do \
if [ -f "$$file" ]; then \
Expand All @@ -2279,10 +2279,10 @@ do-config-star-override:
$$file; \
fi; \
done
. endfor
. endif
. if defined(CONFIG_SUB_OVERRIDE) && !empty(CONFIG_SUB_OVERRIDE)
. for _pattern_ in ${CONFIG_SUB_OVERRIDE}
. endfor
.endif
.if !empty(CONFIG_SUB_OVERRIDE)
. for _pattern_ in ${CONFIG_SUB_OVERRIDE}
${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
for file in ${_pattern_}; do \
if [ -f "$$file" ]; then \
Expand All @@ -2291,8 +2291,19 @@ do-config-star-override:
$$file; \
fi; \
done
. endfor
. endif
. endfor
.endif
.if !empty(CONFIG_RPATH_OVERRIDE)
. for _pattern_ in ${CONFIG_RPATH_OVERRIDE}
${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
for file in ${_pattern_}; do \
if [ -f "$$file" ]; then \
${RM} -f $$file; \
${LN} -s ${PKGSRCDIR}/mk/gnu-config/config.rpath \
$$file; \
fi; \
done
. endfor
.endif

PKGCONFIG_OVERRIDE_SED= \
Expand Down
Loading

0 comments on commit 6d20fd6

Please sign in to comment.