summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-12-06 17:29:01 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-12-06 17:30:14 +0100
commitd83df882620ce3fb6a4a02dc2875c96471b59d89 (patch)
tree6f3ff366f931f1598519f2517868aa7e03297df2 /mk
parent8d27683011689b3a72b8ab18ed0e2b359a40570f (diff)
install config.sub and config.guess always
We need it for toolchain components. Add latest config.sub/config.guess from upstream with a minor patch for sh2eb detection.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildhlp.mk12
-rw-r--r--mk/pkg-bottom.mk11
2 files changed, 12 insertions, 11 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index cebdeb5b7..ae52fc132 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -81,6 +81,18 @@ ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done
[ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \
$(MAKE_TRACE)
@${MAKE} post-patch $(MAKE_TRACE)
+ # always use latest config.sub/config.guess from OpenADK scripts directory
+ cd ${WRKDIST}; \
+ for i in $$(find . -name config.sub);do \
+ if [ -f $$i ]; then \
+ ${CP} ${SCRIPT_DIR}/config.sub $$i; \
+ fi; \
+ done; \
+ for i in $$(find . -name config.guess);do \
+ if [ -f $$i ]; then \
+ ${CP} ${SCRIPT_DIR}/config.guess $$i; \
+ fi; \
+ done;
touch $@
endif
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 66d834df4..e120ef391 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -43,17 +43,6 @@ ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
endif
mkdir -p ${WRKBUILD}
@${MAKE} pre-configure $(MAKE_TRACE)
- @cd ${WRKSRC}; \
- for i in $$(find . -name config.sub);do \
- if [ -f $$i ]; then \
- ${CP} ${SCRIPT_DIR}/config.sub $$i; \
- fi; \
- done; \
- for i in $$(find . -name config.guess);do \
- if [ -f $$i ]; then \
- ${CP} ${SCRIPT_DIR}/config.guess $$i; \
- fi; \
- done;
ifneq ($(filter manual,${CONFIG_STYLE}),)
env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)