shorewall6-lite: fix build on macos
authorSergey V. Lobanov <sergey@lobanov.in>
Fri, 4 Feb 2022 19:47:04 +0000 (22:47 +0300)
committerRosen Penev <rosenp@gmail.com>
Thu, 24 Feb 2022 01:12:50 +0000 (17:12 -0800)
shorewall6-lite macos build fails due to:
1. MacOS bash is too old (3.x), but shorewall6-lite 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

3. fakeuname does not work in install.sh because install.sh
redefines PATH.
This patch removes PATH=... from install.sh on macos

Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
net/shorewall6-lite/Makefile

index 80428c99d450bcc4250cd771b49fa189e6c1c2d4..302dbfcfded3e95b9920891a62057d9affd1e7b3 100644 (file)
@@ -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,12 +23,17 @@ PKG_SOURCE_URL:=http://shorewall.org/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/sh
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_HASH:=086764bb976d199b45563e39b1ab9a131ccb521d60d186f606dd8bbcee7fcada
 
+PKG_BUILD_DEPENDS:=HOST_OS_MACOS:fakeuname/host
+
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 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-lite
     SECTION:=net
@@ -58,8 +63,27 @@ endef
 CONFIGURE_ARGS += \
        vendor=openwrt
 
+# MacOS bash is too old for shorewall6-lite, 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))
+
+# install.sh explicitly defines PATH= so fakeuname doesn't work. Remove PATH= on macos
+define Build/Prepare
+       $(call Build/Prepare/Default)
+ifeq ($(CONFIG_HOST_OS_MACOS),y)
+       $(SED) '/^PATH=/d' $(PKG_BUILD_DIR)/install.sh
+endif
+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-lite/install