From 8f0f61859159123604efbc1800b431fbe9402c80 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Wed, 9 Jun 2021 14:00:33 +0300 Subject: [PATCH 1/3] sdk/src/sdcc.inc.mk: replaced `awk` with `sed` --- sdk/src/sdcc.inc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/src/sdcc.inc.mk b/sdk/src/sdcc.inc.mk index 1733973..dba6a4a 100644 --- a/sdk/src/sdcc.inc.mk +++ b/sdk/src/sdcc.inc.mk @@ -99,10 +99,10 @@ install-sdcc: | sdcc/.extracted for d in $(SDCC_SUBDIRS); do\ if [ $$d = bin ]; then\ find $$d -type f\ - | awk '{print gensub(/^(.+)\/([^/]+)/, "$$(DEST)$$(prefix)/\\1/\\2: \\1/\\2 | $$(DEST)$$(prefix)/\\1\n\t$$(INSTALL_PROGRAM) -m 755 $$< $$@", "g")}';\ + | sed -Ee 's,^(.+)/([^/]+),$$(DEST)$$(prefix)/\1/\2: \1/\2 | $$(DEST)$$(prefix)/\1\n\t$$(INSTALL_PROGRAM) -m 755 $$< $$@,';\ else\ find $$d -type f\ - | awk '{print gensub(/^(.+)\/([^/]+)/, "$$(DEST)$$(prefix)/\\1/\\2: \\1/\\2 | $$(DEST)$$(prefix)/\\1\n\t$$(INSTALL) -m 644 $$< $$@", "g")}';\ + | sed -Ee 's,^(.+)/([^/]+),$$(DEST)$$(prefix)/\1/\2: \1/\2 | $$(DEST)$$(prefix)/\1\n\t$$(INSTALL) -m 755 $$< $$@,';\ fi;\ done; } >install.mk;\ $(MAKE) -w -f install.mk DEST=$(DEST) prefix=$(prefix) INSTALL=$(INSTALL) INSTALL_PROGRAM=$(INSTALL_PROGRAM) install From a02697420de861b45c2acccafe0e81b0418f0441 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Wed, 9 Jun 2021 14:02:23 +0300 Subject: [PATCH 2/3] sdk/common.mk: fixed `ZCCCFG` varible assignment --- sdk/common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/common.mk b/sdk/common.mk index 91ec216..0c9c987 100644 --- a/sdk/common.mk +++ b/sdk/common.mk @@ -29,7 +29,7 @@ ifeq ($(OS),Windows_NT) ZXSDK_PLATFORM = $(ZXSDK)/windows-x86 endif else - ZXSDK_PLATFORM = $(ZXSDK) + ZXSDK_PLATFORM = $(ZXSDK) endif export ZXSDK_PLATFORM @@ -80,7 +80,7 @@ ZCCCFG = $(Z88DK)/lib/config ifeq ($(OS),Windows_NT) # Fix paths under Cygwin for Z88DK on Windows ifeq ($(shell echo $$OSTYPE),cygwin) - ZCCCFG = $(shell cygpath -m $(ZCCCFG)) + ZCCCFG := $(shell cygpath -m $(ZCCCFG)) endif endif export ZCCCFG From 37c0f00037c8924d2921d9f34700c463b72c8114 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Wed, 9 Jun 2021 14:21:57 +0300 Subject: [PATCH 3/3] sdk/src/sdcc.inc.mk: fixed installing file permissions --- sdk/src/sdcc.inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/src/sdcc.inc.mk b/sdk/src/sdcc.inc.mk index dba6a4a..b9d52f6 100644 --- a/sdk/src/sdcc.inc.mk +++ b/sdk/src/sdcc.inc.mk @@ -102,7 +102,7 @@ install-sdcc: | sdcc/.extracted | sed -Ee 's,^(.+)/([^/]+),$$(DEST)$$(prefix)/\1/\2: \1/\2 | $$(DEST)$$(prefix)/\1\n\t$$(INSTALL_PROGRAM) -m 755 $$< $$@,';\ else\ find $$d -type f\ - | sed -Ee 's,^(.+)/([^/]+),$$(DEST)$$(prefix)/\1/\2: \1/\2 | $$(DEST)$$(prefix)/\1\n\t$$(INSTALL) -m 755 $$< $$@,';\ + | sed -Ee 's,^(.+)/([^/]+),$$(DEST)$$(prefix)/\1/\2: \1/\2 | $$(DEST)$$(prefix)/\1\n\t$$(INSTALL) -m 644 $$< $$@,';\ fi;\ done; } >install.mk;\ $(MAKE) -w -f install.mk DEST=$(DEST) prefix=$(prefix) INSTALL=$(INSTALL) INSTALL_PROGRAM=$(INSTALL_PROGRAM) install