From 3b5533e68959bbff4516057a205fb0a71bf6a702 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 13 Feb 2022 19:37:11 +0100
Subject: [PATCH] make deopens on swig

---
 config/Config-build.in            |  3 +++
 include/prereq-build.mk           |  2 +-
 package/boot/uboot-sunxi/Makefile | 17 +++++++++--------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/config/Config-build.in b/config/Config-build.in
index 9bef36e53e..0306fda12d 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -17,6 +17,9 @@ config EXPERIMENTAL
 	
 	  If you plan to use this build in production, say NO!
 
+config DEPEND_ON_SWIG
+	bool
+
 menu "Global build settings"
 
 	config JSON_OVERVIEW_IMAGE_INFO
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index de7455cfbe..7f8b4726d8 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -190,7 +190,7 @@ $(eval $(call SetupHostCommand,which,Please install 'which', \
 	/bin/which which, \
 	which which))
 
-$(eval $(call $(if $(CONFIG_PACKAGE_uboot-envtools),SetupHostCommand,Ignore),swig,Please install 'swig', \
+$(eval $(call $(if $(CONFIG_DEPEND_ON_SWIG),SetupHostCommand,Ignore),swig,Please install 'swig', \
 	swig -python -help 2>&1 |grep 'Python'))
 
 $(STAGING_DIR_HOST)/bin/mkhash: $(SCRIPT_DIR)/mkhash.c
diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index 16ea9c13dc..404ee88fb6 100644
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -25,6 +25,7 @@ define U-Boot/Default
   UBOOT_IMAGE:=u-boot-sunxi-with-spl.bin
   UENV:=default
   HIDDEN:=1
+  DEPENDS:= +@DEPEND_ON_SWIG
 endef
 
 define U-Boot/a64-olinuxino
@@ -249,7 +250,7 @@ define U-Boot/libretech_all_h3_cc_h5
   BUILD_SUBTARGET:=cortexa53
   NAME:=Libre Computer ALL-H3-CC H5
   BUILD_DEVICES:=libretech_all-h3-cc-h5
-  DEPENDS:=+PACKAGE_u-boot-libretech_all_h3_cc_h5:arm-trusted-firmware-sunxi-a64
+  DEPENDS+=+PACKAGE_u-boot-libretech_all_h3_cc_h5:arm-trusted-firmware-sunxi-a64
   UENV:=a64
   ATF:=a64
 endef
@@ -258,7 +259,7 @@ define U-Boot/nanopi_neo_plus2
   BUILD_SUBTARGET:=cortexa53
   NAME:=NanoPi NEO Plus2 (H5)
   BUILD_DEVICES:=friendlyarm_nanopi-neo-plus2
-  DEPENDS:=+PACKAGE_u-boot-nanopi_neo_plus2:arm-trusted-firmware-sunxi-a64
+  DEPENDS+=+PACKAGE_u-boot-nanopi_neo_plus2:arm-trusted-firmware-sunxi-a64
   UENV:=a64
   ATF:=a64
 endef
@@ -267,7 +268,7 @@ define U-Boot/nanopi_neo2
   BUILD_SUBTARGET:=cortexa53
   NAME:=NanoPi NEO2 (H5)
   BUILD_DEVICES:=friendlyarm_nanopi-neo2
-  DEPENDS:=+PACKAGE_u-boot-nanopi_neo2:arm-trusted-firmware-sunxi-a64
+  DEPENDS+=+PACKAGE_u-boot-nanopi_neo2:arm-trusted-firmware-sunxi-a64
   UENV:=a64
   ATF:=a64
 endef
@@ -276,7 +277,7 @@ define U-Boot/nanopi_r1s_h5
   BUILD_SUBTARGET:=cortexa53
   NAME:=NanoPi R1S (H5)
   BUILD_DEVICES:=friendlyarm_nanopi-r1s-h5
-  DEPENDS:=+PACKAGE_u-boot-nanopi_r1s_h5:arm-trusted-firmware-sunxi-a64
+  DEPENDS+=+PACKAGE_u-boot-nanopi_r1s_h5:arm-trusted-firmware-sunxi-a64
   UENV:=a64
   ATF:=a64
 endef
@@ -285,7 +286,7 @@ define U-Boot/pine64_plus
   BUILD_SUBTARGET:=cortexa53
   NAME:=Pine64 Plus A64
   BUILD_DEVICES:=pine64_pine64-plus
-  DEPENDS:=+PACKAGE_u-boot-pine64_plus:arm-trusted-firmware-sunxi-a64
+  DEPENDS+=+PACKAGE_u-boot-pine64_plus:arm-trusted-firmware-sunxi-a64
   UENV:=a64
   ATF:=a64
 endef
@@ -300,7 +301,7 @@ define U-Boot/sopine_baseboard
   BUILD_SUBTARGET:=cortexa53
   NAME:=Sopine Baseboard
   BUILD_DEVICES:=pine64_sopine-baseboard
-  DEPENDS:=+PACKAGE_u-boot-sopine_baseboard:arm-trusted-firmware-sunxi-a64
+  DEPENDS+=+PACKAGE_u-boot-sopine_baseboard:arm-trusted-firmware-sunxi-a64
   UENV:=a64
   ATF:=a64
 endef
@@ -310,7 +311,7 @@ define U-Boot/orangepi_zero_plus
   BUILD_SUBTARGET:=cortexa53
   NAME:=Xunlong Orange Pi Zero Plus
   BUILD_DEVICES:=xunlong_orangepi-zero-plus
-  DEPENDS:=+PACKAGE_u-boot-orangepi_zero_plus:arm-trusted-firmware-sunxi-a64
+  DEPENDS+=+PACKAGE_u-boot-orangepi_zero_plus:arm-trusted-firmware-sunxi-a64
   UENV:=a64
   ATF:=a64
 endef
@@ -319,7 +320,7 @@ define U-Boot/orangepi_pc2
   BUILD_SUBTARGET:=cortexa53
   NAME:=Xunlong Orange Pi PC2
   BUILD_DEVICES:=xunlong_orangepi-pc2
-  DEPENDS:=+PACKAGE_u-boot-orangepi_pc2:arm-trusted-firmware-sunxi-a64
+  DEPENDS+=+PACKAGE_u-boot-orangepi_pc2:arm-trusted-firmware-sunxi-a64
   UENV:=a64
   ATF:=a64
 endef
-- 
2.30.2