summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/gnutls/Makefile8
-rw-r--r--package/libnettle/Makefile3
-rw-r--r--package/libtasn1/Makefile3
-rwxr-xr-xpackage/libunistring/Makefile3
-rw-r--r--package/u-boot/Makefile2
-rw-r--r--package/u-boot/patches/patch-tools_Makefile11
-rw-r--r--target/config/Config.in.binutils6
-rw-r--r--toolchain/binutils/Makefile.inc7
-rw-r--r--toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch38
9 files changed, 69 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
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index cf11a76c9..3e141d4d6 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -8,6 +8,7 @@ default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_CPU_ARC_ARC64
default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32
default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX
default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32
+default ADK_TOOLCHAIN_BINUTILS_2_26 if ADK_TARGET_ARCH_BFIN && ADK_TARGET_BINFMT_FDPIC
default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_NIOS2
default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_X86_64
default ADK_TOOLCHAIN_BINUTILS_2_44
@@ -54,6 +55,11 @@ config ADK_TOOLCHAIN_BINUTILS_2_37
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_KVX
+config ADK_TOOLCHAIN_BINUTILS_2_26
+ bool "2.26"
+ depends on !ADK_TARGET_ARCH_AVR32
+ depends on !ADK_TARGET_ARCH_KVX
+
config ADK_TOOLCHAIN_BINUTILS_ARC
bool "arc-2023.09"
depends on ADK_TARGET_ARCH_ARC
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index 9e9e9a4c4..1fcab41a2 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -58,6 +58,13 @@ PKG_HASH:= c44968b97cd86499efbc4b4ab7d98471f673e5414c554ef54afa930062dbbfcb
PKG_SITES:= ${MASTER_SITE_GNU:=binutils/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_26),y)
+PKG_VERSION:= 2.26
+PKG_RELEASE:= 1
+PKG_HASH:= 9615feddaeedc214d1a1ecd77b6697449c952eab69d79ab2125ea050e944bcc1
+PKG_SITES:= ${MASTER_SITE_GNU:=binutils/}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
ifeq ($(ADK_TOOLCHAIN_BINUTILS_KVX),y)
PKG_VERSION:= 782547a4e2bdf1308728032853678ca69bb154ea
PKG_GIT:= hash
diff --git a/toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch b/toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch
new file mode 100644
index 000000000..074317a24
--- /dev/null
+++ b/toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch
@@ -0,0 +1,38 @@
+From ed3056ebdb9795446157af03d3e08fbb93c1b01d Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Tue, 29 Mar 2016 10:24:16 +0100
+Subject: [PATCH] Relax assertion in BFIN linker to allow for discard GOT
+ relocs.
+
+ PR 17334
+ * elf32-bfin.c (elf32_bfinfdpic_finish_dynamic_sections): Relax
+ assertion on the size of the got section to allow it to be bigger
+ than the number of relocs.
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ bfd/elf32-bfin.c | 8 +++++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
+index 7cc8b6d851e..b2fcf38b470 100644
+--- a/bfd/elf32-bfin.c
++++ b/bfd/elf32-bfin.c
+@@ -4457,7 +4457,13 @@ elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd,
+ if (bfinfdpic_got_section (info))
+ {
+ BFD_ASSERT (bfinfdpic_gotrel_section (info)->size
+- == (bfinfdpic_gotrel_section (info)->reloc_count
++ /* PR 17334: It appears that the GOT section can end up
++ being bigger than the number of relocs. Presumably
++ because some relocs have been deleted. A test case has
++ yet to be generated for verify this, but in the meantime
++ the test below has been changed from == to >= so that
++ applications can continue to be built. */
++ >= (bfinfdpic_gotrel_section (info)->reloc_count
+ * sizeof (Elf32_External_Rel)));
+
+ if (bfinfdpic_gotfixup_section (info))
+--
+2.39.5
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-23 04:39:38 +0000