From 1e8a2130a5b5ce6697956379e17bdeee435286ae Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Tue, 29 Oct 2013 09:17:25 +0100
Subject: update python2 and use new host infrastructure

---
 mk/buildhlp.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 8b6a4a8c8..ef8c55391 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -98,12 +98,12 @@ endif
 		env ${AUTOTOOL_ENV} autoreconf -if)
 	@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
 	@# restore config.sub/config.guess
-	@for i in $$(find ${WRKDIR}.orig -name config.sub);do \
+	@for i in $$(find ${WRKDIR} -name config.sub);do \
 		if [ -f $$i.bak ];then \
 			mv $$i.bak $$i; \
 		fi;\
 	done
-	@for i in $$(find ${WRKDIR}.orig -name config.guess);do \
+	@for i in $$(find ${WRKDIR} -name config.guess);do \
 		if [ -f $$i.bak ];then \
 			mv $$i.bak $$i; \
 		fi;\
-- 
cgit v1.2.3


From 21795cc1a20760ff37bca88b799fef664e70ccf2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Oct 2013 10:32:23 +0100
Subject: convert tslib to autotool infrastructure, downgrade m4, newest
 version have problems generating correct Makefiles

---
 mk/buildhlp.mk   | 2 +-
 mk/pkg-bottom.mk | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 8b6a4a8c8..64945c158 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -95,7 +95,7 @@ else
 endif
 	@-test -r ${WRKDIR}/.autoreconf_done && \
 		(cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \
-		env ${AUTOTOOL_ENV} autoreconf -if)
+		env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE)
 	@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
 	@# restore config.sub/config.guess
 	@for i in $$(find ${WRKDIR}.orig -name config.sub);do \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index bf8ed4ea3..34e5405a8 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -18,9 +18,9 @@ do-configure:
 post-configure:
 ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
 ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
-	cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if
-	rm -rf ${WRKSRC}/autom4te.cache
-	touch ${WRKDIR}/.autoreconf_done
+	cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if $(MAKE_TRACE)
+	@rm -rf ${WRKSRC}/autom4te.cache
+	@touch ${WRKDIR}/.autoreconf_done
 endif
 	mkdir -p ${WRKBUILD}
 	@${MAKE} pre-configure $(MAKE_TRACE)
-- 
cgit v1.2.3