u-boot: add host dependencies, remove patch

6 files changed, 18 insertions, 12 deletions

diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index b93c9f15d..1c32b7979 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		libs/crypto
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib libnettle libgmp libunistring
 PKG_BUILDDEP:=		libgcrypt liblzo libtasn1
 PKG_BUILDDEP+=		zlib ncurses libnettle libunistring
+HOST_BUILDDEP:=		libnettle-host libtasn1-host libunistring-host
 PKG_URL:=		http://www.gnutls.org/
 PKG_SITES:=		https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/
 PKG_LIBNAME:=		libgnutls
@@ -27,8 +28,10 @@ PKG_FLAVOURS_LIBGNUTLS:=WITH_CRYPTODEV
 PKGFD_WITH_CRYPTODEV:=	enable support for cryptodev-linux
 PKGFB_WITH_CRYPTODEV:=	cryptodev-linux
 
+include ${ADK_TOPDIR}/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBGNUTLS,libgnutls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS),$(PKG_OPTS)))
 $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_GNUTLS_UTILS),$(PKGSD_GNUTLS_UTILS),$(PKGSC_GNUTLS_UTILS)))
 
@@ -37,6 +40,10 @@ CONFIGURE_ARGS+= 	--enable-cryptodev
 endif
 
 TARGET_LDFLAGS+=	-pthread
+HOST_CONFIGURE_ARGS+=	--without-p11-kit \
+			--disable-seccomp-tests \
+			--disable-tests \
+			--disable-doc
 CONFIGURE_ARGS+=	--disable-rpath \
 			--disable-doc \
 			--disable-tests \
@@ -54,4 +61,5 @@ gnutls-utils-install:
 	$(CP) $(WRKINST)/usr/bin/{{cert,psk}tool,gnutls-{cli,serv}} \
 	    $(IDIR_GNUTLS_UTILS)/usr/bin
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libnettle/Makefile b/package/libnettle/Makefile
index c9d3f38e1..9eb763d9e 100644
--- a/package/libnettle/Makefile
+++ b/package/libnettle/Makefile
@@ -18,8 +18,10 @@ PKG_OPTS:=		dev
 DISTFILES:=             nettle-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/nettle-${PKG_VERSION}
 
+include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBNETTLE,libnettle,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBNETTLE,libnettle,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-documentation
@@ -31,4 +33,5 @@ libnettle-install:
 	$(CP) $(WRKINST)/usr/lib/libhogweed.so* \
 		$(IDIR_LIBNETTLE)/usr/lib
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
index e91f75001..7cf62dc53 100644
--- a/package/libtasn1/Makefile
+++ b/package/libtasn1/Makefile
@@ -15,8 +15,10 @@ PKG_OPTS:=		dev
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
+include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBTASN1,libtasn1,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--disable-gtk-doc-html \
@@ -26,4 +28,5 @@ libtasn1-install:
 	$(INSTALL_DIR) $(IDIR_LIBTASN1)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libtasn1.so* $(IDIR_LIBTASN1)/usr/lib
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile
index 46b83438a..a6ea2f4b2 100755
--- a/package/libunistring/Makefile
+++ b/package/libunistring/Makefile
@@ -13,12 +13,15 @@ PKG_URL:=		http://www.gnu.org/software/libunistring/
 PKG_SITES:=		${MASTER_SITE_GNU:=libunistring/}
 PKG_OPTS:=		dev
 
+include $(ADK_TOPDIR)/mk/host.mk
 include ${ADK_TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,LIBUNISTRING,libunistring,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBUNISTRING,libunistring,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libunistring-install:
 	${INSTALL_DIR} ${IDIR_LIBUNISTRING}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libunistring.so* ${IDIR_LIBUNISTRING}/usr/lib
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index ba64d7356..bf97764b2 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
-HOST_BUILDDEP:=		openssl-host dtc-host swig-host python3-host python-setuptools-host
+HOST_BUILDDEP:=		gnutls-host openssl-host dtc-host swig-host python3-host python-setuptools-host
 PKG_BUILDDEP:=		python3-host python-setuptools-host swig-host u-boot-host
 PKG_URL:=		http://www.denx.de/wiki/U-Boot	
 PKG_SITES:=		ftp://ftp.denx.de/pub/u-boot/
diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile
deleted file mode 100644
index fc284ad58..000000000
--- a/package/u-boot/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- u-boot-2024.01.orig/tools/Makefile	2024-01-08 16:37:48.000000000 +0100
-+++ u-boot-2024.01/tools/Makefile	2024-01-17 17:56:21.004096375 +0100
-@@ -250,7 +250,7 @@ HOSTLDLIBS_mkeficapsule += \
- 	$(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls")
- HOSTLDLIBS_mkeficapsule += \
- 	$(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid")
--hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
-+#hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
- 
- mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o
- HOSTLDLIBS_mkfwumdata += -luuid