Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00
Code Issues Wiki Activity

main/nettle: patch gcc15

Browse source
This commit is contained in:
fossdd 2025-05-02 23:06:38 +02:00 • committed by Patrycja Rosa
parent 183087ae9c
commit 2ccb060246
2 changed files with 48 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
main/nettle/APKBUILD
View file

@ -11,7 +11,9 @@ license="GPL-2.0-or-later OR LGPL-3.0-or-later"
depends_dev="gmp-dev"
makedepends="$depends_dev m4"
subpackages="$pkgname-static $pkgname-dev $pkgname-utils"
source="https://ftp.gnu.org/gnu/nettle/nettle-$pkgver.tar.gz"
source="https://ftp.gnu.org/gnu/nettle/nettle-$pkgver.tar.gz
gcc15.patch
"
# secfixes:
# 3.7.3-r0:
@ -54,4 +56,5 @@ utils() {
sha512sums="
e8673bbcde9cde859ccae75ed6c9c30591e68a995a7c6d724106cfd67a5a5bd45b3468d742443b6565628849d0fd29505a28ca5ee4e89dd13197cdb51429f96c nettle-3.10.1.tar.gz
b38fbfc34137f7ad8b87536c0250257d6de4c1a5c7bd4d2876dd009a4130c802b828fa54f9ac6a28224af3ec33d0011ad7579a10b370bcc2fe91cce6641bd745 gcc15.patch
"

44
main/nettle/gcc15.patch Normal file
View file

@ -0,0 +1,44 @@
From 20eb61eded3bf2ef03e1f37c8c1535b9c246d0f7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 22 Mar 2025 13:48:29 -0700
Subject: [PATCH] getopt: Fix getopt/getenv signatures in declarations
GCC-15 complains about this when trying to build on musl
| ../nettle-3.10.1/getopt.c:139:14: error: conflicting types for 'getenv'; have 'char *(void)'
| 139 | extern char *getenv ();
| | ^~~~~~
Upstream-Status: Submitted [https://lists.lysator.liu.se/mailman/hyperkitty/list/nettle-bugs@lists.lysator.liu.se/thread/R6BDHRO44KSRDAOZQAREYICI2RG5PVNC/]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
getopt.c | 2 +-
getopt.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/getopt.c b/getopt.c
index 9d29de7..5b89302 100644
--- a/getopt.c
+++ b/getopt.c
@@ -136,7 +136,7 @@ static struct _getopt_data getopt_data;
whose names are inconsistent. */
#ifndef getenv
-extern char *getenv ();
+extern char *getenv (const char *);
#endif
#endif /* not __GNU_LIBRARY__ */
diff --git a/getopt.h b/getopt.h
index da1a01f..ab50792 100644
--- a/getopt.h
+++ b/getopt.h
@@ -166,7 +166,7 @@ extern int __posix_getopt (int ___argc, char *const *___argv,
# endif
# endif
#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
+extern int getopt(int, char * const [], const char *);
#endif /* __GNU_LIBRARY__ */
#ifndef __need_getopt