summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2026-03-18 15:35:05 -0700
committerKhem Raj <raj.khem@gmail.com>2026-03-18 16:18:31 -0700
commitfdb49727a753150890d8d16d26d45fb86fda68bf (patch)
tree743736a3eded77537c079c50454eaec452a294f5
parenta68f03454b1b1097a4cb6930f3ccb3a3ca73954c (diff)
downloadmeta-openembedded-fdb49727a753150890d8d16d26d45fb86fda68bf.tar.gz
links,links-x11: Upgrade to 3.20
Fix build with glibc 2.43+ Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch32
-rw-r--r--meta-oe/recipes-support/links/links-x11_2.30.bb (renamed from meta-oe/recipes-support/links/links-x11_2.26.bb)2
-rw-r--r--meta-oe/recipes-support/links/links.inc1
-rw-r--r--meta-oe/recipes-support/links/links_2.30.bb (renamed from meta-oe/recipes-support/links/links_2.29.bb)2
4 files changed, 35 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch b/meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch
new file mode 100644
index 0000000000..856bdccdbe
--- /dev/null
+++ b/meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch
@@ -0,0 +1,32 @@
1From 75003957e8f526738b479dff7d5d9a5419111f33 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2026 15:30:37 -0700
4Subject: [PATCH] Adjust for c23 prototype for strchr
5
6in glibc 2.43+ functions like strchr, memchr, strstr
7and friends are now const-preserving macros
8
9That means if you pass a const char *, strchr now returns const char *,
10which breaks older code patterns that assumed char * or wrapped the
11result in compatibility helpers
12
13Upstream-Status: Pending
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 ftp.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/ftp.c b/ftp.c
21index 7a8d05d..41c0a25 100644
22--- a/ftp.c
23+++ b/ftp.c
24@@ -768,7 +768,7 @@ do { \
25 } while (0)
26 A(ftp_head);
27 ud = stracpy(get_url_data(c->url));
28- if (strchr(cast_const_char ud, POST_CHAR)) *strchr(cast_const_char ud, POST_CHAR) = 0;
29+ if (strchr(ud, POST_CHAR)) *strchr(ud, POST_CHAR) = 0;
30 s0 = init_str();
31 s0l = 0;
32 add_conv_str(&s0, &s0l, ud, (int)strlen(cast_const_char ud), -1);
diff --git a/meta-oe/recipes-support/links/links-x11_2.26.bb b/meta-oe/recipes-support/links/links-x11_2.30.bb
index cbee1f10f1..29ea339d02 100644
--- a/meta-oe/recipes-support/links/links-x11_2.26.bb
+++ b/meta-oe/recipes-support/links/links-x11_2.30.bb
@@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
10SRC_URI += " file://links2.desktop \ 10SRC_URI += " file://links2.desktop \
11 file://links2.png" 11 file://links2.png"
12 12
13SRC_URI[sha256sum] = "f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb" 13SRC_URI[sha256sum] = "c4631c6b5a11527cdc3cb7872fc23b7f2b25c2b021d596be410dadb40315f166"
14 14
15S = "${UNPACKDIR}/links-${PV}" 15S = "${UNPACKDIR}/links-${PV}"
16 16
diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc
index a255f0ba6b..5946d8be91 100644
--- a/meta-oe/recipes-support/links/links.inc
+++ b/meta-oe/recipes-support/links/links.inc
@@ -8,6 +8,7 @@ DEPENDS = "jpeg libpng flex openssl zlib"
8 8
9SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ 9SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
10 file://ac-prog-cxx.patch \ 10 file://ac-prog-cxx.patch \
11 file://0001-Adjust-for-c23-prototype-for-strchr.patch \
11" 12"
12 13
13PACKAGECONFIG ??= "" 14PACKAGECONFIG ??= ""
diff --git a/meta-oe/recipes-support/links/links_2.29.bb b/meta-oe/recipes-support/links/links_2.30.bb
index e3a15d1819..2a344d11e5 100644
--- a/meta-oe/recipes-support/links/links_2.29.bb
+++ b/meta-oe/recipes-support/links/links_2.30.bb
@@ -8,4 +8,4 @@ EXTRA_OECONF = "--enable-graphics \
8 --without-libtiff --without-svgalib --with-fb \ 8 --without-libtiff --without-svgalib --with-fb \
9 --without-directfb --without-pmshell --without-atheos \ 9 --without-directfb --without-pmshell --without-atheos \
10 --without-x" 10 --without-x"
11SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" 11SRC_URI[sha256sum] = "c4631c6b5a11527cdc3cb7872fc23b7f2b25c2b021d596be410dadb40315f166"