From dca9828479c8fdd4d011e5e47a322aaea862e23a Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Fri, 4 Feb 2022 20:34:40 +0300 Subject: [PATCH] shorewall6: fix build on macos shorewall6 macos build fails due to: 1. MacOS bash is too old (3.x), but shorewall6 requires bash>4 This patch uses OpenWrt tools/bash built for macos (bash 5.x) 2. install.sh detects Darwin using uname and changes install logic, but it fails in case of cross-platform build This patch uses fakeuname/host tool to avoid Darwin detection Signed-off-by: Sergey V. Lobanov --- net/shorewall6/Makefile | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/net/shorewall6/Makefile b/net/shorewall6/Makefile index d89e250ff..92191394a 100644 --- a/net/shorewall6/Makefile +++ b/net/shorewall6/Makefile @@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=8 PKG_BUGFIX_MINOR_VERSION:= PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://shorewall.org/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://slovakia.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -23,11 +23,16 @@ PKG_SOURCE_URL:=http://shorewall.org/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/sh PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_HASH:=e82c3a9538b6548195398dc39c83b01bcf66eb5a22814c915a924b9adc088cd1 +PKG_BUILD_DEPENDS:=HOST_OS_MACOS:fakeuname/host + PKG_MAINTAINER:=Willem van den Akker PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk +ifeq ($(CONFIG_HOST_OS_MACOS),y) + include ../../utils/fakeuname/fakeuname.mk +endif define Package/shorewall6 SECTION:=net @@ -54,12 +59,23 @@ endef CONFIGURE_ARGS += \ vendor=openwrt +# MacOS bash is too old for shorewall6, use OpenWrt host tools/bash built for macos hosts +# use fakeuname to avoid 'if `uname` is Darwin' checks +MACOS_ENV := \ + PATH=$(FAKEUNAME_PATH):$(TARGET_PATH_PKG) \ + $(BASH) + +CONFIGURE_VARS += \ + $(if $(CONFIG_HOST_OS_MACOS),$(MACOS_ENV)) + define Package/shorewall6/conffiles /etc/shorewall6/ endef define Build/Compile - DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh + DESTDIR=$(PKG_INSTALL_DIR) \ + $(if $(CONFIG_HOST_OS_MACOS),$(MACOS_ENV)) \ + $(PKG_BUILD_DIR)/install.sh endef define Package/shorewall6/install