From fe33193ae120b34fee264e15c07f4f76c275e9e3 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 5 Sep 2017 12:39:17 +0200 Subject: [PATCH] pistachio: remove autom4te cache from contrib dir The cache directory content is slightly different on each prepare-port run and fortunately not used at build time. So, we just remove it at the end of port preparation. --- repos/base-pistachio/ports/pistachio.hash | 2 +- repos/base-pistachio/ports/pistachio.port | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/base-pistachio/ports/pistachio.hash b/repos/base-pistachio/ports/pistachio.hash index c6687aa86..d4723c632 100644 --- a/repos/base-pistachio/ports/pistachio.hash +++ b/repos/base-pistachio/ports/pistachio.hash @@ -1 +1 @@ -6543a6d74a384ee61fca197fc04a343cc7a95661 +964a28dc3463447e4245390233ba9f9d08191b21 diff --git a/repos/base-pistachio/ports/pistachio.port b/repos/base-pistachio/ports/pistachio.port index 4a2464876..4c680472d 100644 --- a/repos/base-pistachio/ports/pistachio.port +++ b/repos/base-pistachio/ports/pistachio.port @@ -4,7 +4,7 @@ DOWNLOADS := pistachio.git URL(pistachio) := https://github.com/l4ka/pistachio.git REV(pistachio) := 76bac3d926dc707c6a3243b38c1505d2b5b6537b DIR(pistachio) := src/kernel/pistachio -PATCHES := $(shell find $(REP_DIR)/patches -name *.patch) +PATCHES := $(sort $(wildcard $(REP_DIR)/patches/*.patch)) PATCH_OPT := -p1 -d src/kernel/pistachio $(call check_tool,git) @@ -31,4 +31,4 @@ additional_steps : $(DOWNLOADS) $(VERBOSE)sed -i "s/-melf_/-Wl,-melf_/" `grep -rl melf_ src/kernel/pistachio/user` $(VERBOSE)for i in cmlcompile.py cmlconfigure.py configtrans.py; do \ sed -i "s/env python/env $(PYTHON2)/" src/kernel/pistachio/contrib/cml2/$$i; done - $(VERBOSE)cd src/kernel/pistachio/user; autoheader; autoconf; + $(VERBOSE)cd src/kernel/pistachio/user; autoheader; autoconf; rm -rf autom4te.cache