Skip to content

Commit fbe2ad6

Browse files
committed
Revert "toolchain: fortify-headers: Update to version 2.3.3"
This reverts commit 6268692. The new fortify-headers version needs some more work to be usable in OpenWrt. Revert this to fix the builds again. Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent ab221cf commit fbe2ad6

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

toolchain/fortify-headers/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk
88
include $(INCLUDE_DIR)/target.mk
99

1010
PKG_NAME:=fortify-headers
11-
PKG_VERSION:=2.3.3
12-
PKG_RELEASE=1
11+
PKG_VERSION:=1.1
12+
PKG_RELEASE=3
1313

1414
PKG_SOURCE_PROTO:=git
1515
PKG_SOURCE_URL:=https://github.com/jvoisin/$(PKG_NAME).git
16-
PKG_SOURCE_DATE:=2024-10-21
17-
PKG_SOURCE_VERSION:=dcdd2f1fb065b6e98d87ab7b367e8fb483f9b59c
18-
PKG_MIRROR_HASH:=088a7fda614daf4e42110dbb2a288f0a5f3b25ee41ed92a988e7b3c15c76230b
16+
PKG_SOURCE_DATE:=2019-04-14
17+
PKG_SOURCE_VERSION:=e3fee64643279c144efd3d6856ed4e818c0d5ca2
18+
PKG_MIRROR_HASH:=f2ce18b031aecbf43d18142941ece7c90691a8b4e96fbb1d5af94f24e5572dad
1919

2020
include $(INCLUDE_DIR)/toolchain-build.mk
2121

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/include/poll.h
2+
+++ b/include/poll.h
3+
@@ -39,7 +39,7 @@ _FORTIFY_FN(poll) int poll(struct pollfd
4+
return __orig_poll(__f, __n, __s);
5+
}
6+
7+
-#ifdef _GNU_SOURCE
8+
+#if defined(_GNU_SOURCE) && !(defined(_REDIR_TIME64) && _REDIR_TIME64)
9+
#undef ppoll
10+
_FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s,
11+
const sigset_t *__m)

toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Add __extension__ before #include-next in strings.h as was done for all other he
1212

1313
--- a/include/strings.h
1414
+++ b/include/strings.h
15-
@@ -17,6 +17,9 @@
15+
@@ -16,6 +16,9 @@
1616
#ifndef _FORTIFY_STRINGS_H
1717
#define _FORTIFY_STRINGS_H
1818

0 commit comments

Comments
 (0)