diff options
| author | Tomasz Maciej Nowak | 2025-05-28 13:26:23 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-05-30 11:10:11 +0000 |
| commit | 2f289e3b7452ac877632d9f3b2237f8276076a79 (patch) | |
| tree | b9c9e0de85759888ec50754a88190f03f333ff0d | |
| parent | 6d46015d8b31373aa71c703de9fc409f2430646d (diff) | |
| download | openwrt-2f289e3b7452ac877632d9f3b2237f8276076a79.tar.gz | |
libiconv: fix compilation on hosts GCC=15
Backport upstream commit dropping external definition of mbrtowc. The
said definition conflicts with one provided by GCC 15. Issue found on
24.10 SDK.
Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
| -rw-r--r-- | package/libs/libiconv-full/Makefile | 2 | ||||
| -rw-r--r-- | package/libs/libiconv-full/patches/001-Fix-a-clang-warning-a-function-declaration-without-a.patch | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/package/libs/libiconv-full/Makefile b/package/libs/libiconv-full/Makefile index 0c793973a0..8837942585 100644 --- a/package/libs/libiconv-full/Makefile +++ b/package/libs/libiconv-full/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libiconv-full PKG_VERSION:=1.17 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=libiconv-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libiconv diff --git a/package/libs/libiconv-full/patches/001-Fix-a-clang-warning-a-function-declaration-without-a.patch b/package/libs/libiconv-full/patches/001-Fix-a-clang-warning-a-function-declaration-without-a.patch new file mode 100644 index 0000000000..86cd2bc973 --- /dev/null +++ b/package/libs/libiconv-full/patches/001-Fix-a-clang-warning-a-function-declaration-without-a.patch @@ -0,0 +1,33 @@ +From e46dee2f581c1167137bcd045e114e96a9f00483 Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Sun, 29 Jan 2023 20:07:21 +0100 +Subject: [PATCH] Fix a clang warning "a function declaration without a + prototype...". + +* lib/loop_wchar.h (mbrtowc): Don't declare. Drop portability to BeOS. +--- + lib/loop_wchar.h | 3 +-- + 1 file changed, 1 insertions(+), 2 deletions(-) + +diff --git a/lib/loop_wchar.h b/lib/loop_wchar.h +index b3edc2925c60..9eb508e81a4f 100644 +--- a/lib/loop_wchar.h ++++ b/lib/loop_wchar.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2000-2002, 2005-2006, 2008-2009, 2011 Free Software Foundation, Inc. ++ * Copyright (C) 2000-2002, 2005-2006, 2008-2009, 2011, 2023 Free Software Foundation, Inc. + * This file is part of the GNU LIBICONV Library. + * + * The GNU LIBICONV Library is free software; you can redistribute it +@@ -36,7 +36,6 @@ + # include <wchar.h> + # define BUF_SIZE 64 /* assume MB_LEN_MAX <= 64 */ + /* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ +- extern size_t mbrtowc (); + # ifdef mbstate_t + # define mbrtowc(pwc, s, n, ps) (mbrtowc)(pwc, s, n, 0) + # define mbsinit(ps) 1 +-- +2.49.0 + |