From 4a71973e95f91b13158610b7f6e5a2bc7d9ce394 Mon Sep 17 00:00:00 2001 From: Will Angenent Date: Sat, 15 Apr 2023 08:43:53 +0100 Subject: [PATCH 1/3] Use POSIX -R instead of -r in copy for better portability In MacOS, -r will exit with 1 if any broken symlinks are encountered. -r is "implementation-defined" according to POSIX. -R is well defined. --- cook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cook.sh b/cook.sh index 99d20102b..ba4a7a12a 100755 --- a/cook.sh +++ b/cook.sh @@ -178,7 +178,7 @@ function op { then mkdir "${COOKBOOK_BUILD}" else - cp -rp source "${COOKBOOK_BUILD}" + cp -Rp source "${COOKBOOK_BUILD}" fi for patch in *.patch From 34d36bdadc2a62562ac0accb60a9d2f8a212af1b Mon Sep 17 00:00:00 2001 From: Will Angenent Date: Sat, 15 Apr 2023 08:54:08 +0100 Subject: [PATCH 2/3] Use relative path for which binary --- recipes/netsurf/01_redox.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes/netsurf/01_redox.patch b/recipes/netsurf/01_redox.patch index 6568f7730..f200853bb 100644 --- a/recipes/netsurf/01_redox.patch +++ b/recipes/netsurf/01_redox.patch @@ -84,3 +84,15 @@ diff -ruwN source/netsurf/utils/config.h source-new/netsurf/utils/config.h #undef HAVE_STRPTIME #undef HAVE_STRFTIME #else + diff -ruwN source/buildsystem/makefiles/Makefile.tools source-new/buildsystem/makefiles/Makefile.tools +--- source/buildsystem/makefiles/Makefile.tools 2023-04-15 08:48:37.000000000 +0100 ++++ source-new/buildsystem/makefiles/Makefile.tools 2023-04-15 08:48:37.000000000 +0100 +@@ -135,7 +135,7 @@ + endif + + # Search the path for the compiler +- toolpath_ := $(shell /bin/which $(CC__)) ++ toolpath_ := $(shell which $(CC__)) + ifeq ($(toolpath_),) + toolpath_ := /opt/netsurf/$(HOST)/cross/bin/ + CC__ := $(toolpath_)$(HOST)-gcc From 80aebb3aae2b8245c1ecdad10804ebbe7a96be52 Mon Sep 17 00:00:00 2001 From: Will Angenent Date: Sat, 15 Apr 2023 09:16:01 +0100 Subject: [PATCH 3/3] Remove non portable -T option in install --- recipes/netsurf/01_redox.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes/netsurf/01_redox.patch b/recipes/netsurf/01_redox.patch index f200853bb..e59523143 100644 --- a/recipes/netsurf/01_redox.patch +++ b/recipes/netsurf/01_redox.patch @@ -96,3 +96,15 @@ diff -ruwN source/netsurf/utils/config.h source-new/netsurf/utils/config.h ifeq ($(toolpath_),) toolpath_ := /opt/netsurf/$(HOST)/cross/bin/ CC__ := $(toolpath_)$(HOST)-gcc +diff -ruwN source/netsurf/frontends/framebuffer/Makefile source-new/netsurf/frontends/framebuffer/Makefile +--- source/netsurf/frontends/framebuffer/Makefile 2020-05-24 22:35:23.000000000 +0100 ++++ source-new/netsurf/frontends/framebuffer/Makefile 2023-04-15 09:09:18.000000000 +0100 +@@ -222,7 +222,7 @@ + install-framebuffer: + $(VQ)echo " INSTALL: $(DESTDIR)/$(PREFIX)" + $(Q)$(INSTALL) -d $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN) +- $(Q)$(INSTALL) -T $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)/netsurf-fb ++ $(Q)$(INSTALL) $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)/netsurf-fb + $(Q)$(INSTALL) -d $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES) + $(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do $(INSTALL) -m 644 $(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done + $(Q)$(RM) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)/Messages