From ee64e7f202821cc5b8583d34f63df174a3057b99 Mon Sep 17 00:00:00 2001 From: Yanase Yuki Date: Thu, 12 Sep 2024 21:09:21 +0900 Subject: [PATCH] toolchain/fortify-headers: update download url Development of fortify-headers has been moved to GitHub. Gentoo [1] and Alpine Linux [2] already uses it. Since updating fortify-headers to new version causes a lot of compile errors, this commit does not bump version. This commit also refresh patch. [1]: https://packages.gentoo.org/packages/sys-libs/fortify-headers [2]: https://git.alpinelinux.org/aports/log/main/fortify-headers Signed-off-by: Yanase Yuki Link: https://github.com/openwrt/openwrt/pull/16374 Signed-off-by: Robert Marko --- toolchain/fortify-headers/Makefile | 8 +++++--- .../patches/002-strings.h-add-__extension__-mark.patch | 5 ----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/toolchain/fortify-headers/Makefile b/toolchain/fortify-headers/Makefile index 3362fb427ad4..7e6bad51a5a2 100644 --- a/toolchain/fortify-headers/Makefile +++ b/toolchain/fortify-headers/Makefile @@ -11,9 +11,11 @@ PKG_NAME:=fortify-headers PKG_VERSION:=1.1 PKG_RELEASE=3 -PKG_SOURCE_URL:=https://dl.2f30.org/releases -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=6ba5d860a2d2ba4c3346924b93930c34856eafe148bdbdf271ecab8065201fb6 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/jvoisin/$(PKG_NAME).git +PKG_SOURCE_DATE:=2019-04-14 +PKG_SOURCE_VERSION:=e3fee64643279c144efd3d6856ed4e818c0d5ca2 +PKG_MIRROR_HASH:=f2ce18b031aecbf43d18142941ece7c90691a8b4e96fbb1d5af94f24e5572dad include $(INCLUDE_DIR)/toolchain-build.mk diff --git a/toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch b/toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch index 001e578e60d7..a07bb15aa1db 100644 --- a/toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch +++ b/toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch @@ -10,8 +10,6 @@ Add __extension__ before #include-next in strings.h as was done for all other he include/strings.h | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/include/strings.h b/include/strings.h -index a16e1ad..d1902db 100644 --- a/include/strings.h +++ b/include/strings.h @@ -16,6 +16,9 @@ @@ -24,6 +22,3 @@ index a16e1ad..d1902db 100644 #include_next #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 --- -2.34.1 -