Skip to content

Commit ea03d5c

Browse files
authored
Merge pull request #354 from hbiyik/Omega-gcc15
Omega gcc15 compilation fixes
2 parents d5b4a3c + c145e3c commit ea03d5c

File tree

5 files changed

+34
-9
lines changed

5 files changed

+34
-9
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 14837bacbbd80804a11fee2016f660d132bf8aec Mon Sep 17 00:00:00 2001
2+
From: Marc Glisse <marc.glisse@inria.fr>
3+
Date: Wed, 29 Jan 2025 22:38:02 +0100
4+
Subject: [PATCH] Complete function prototype in acinclude.m4 for C23
5+
compatibility
6+
7+
---
8+
ChangeLog | 5 +++++
9+
acinclude.m4 | 2 +-
10+
2 files changed, 6 insertions(+), 1 deletion(-)
11+
12+
diff --git a/acinclude.m4 b/acinclude.m4
13+
index fddb5fb07..4fca12de2 100644
14+
--- a/acinclude.m4
15+
+++ b/acinclude.m4
16+
@@ -609,7 +609,7 @@ GMP_PROG_CC_WORKS_PART([$1], [long long reliability test 1],
17+
18+
#if defined (__GNUC__) && ! defined (__cplusplus)
19+
typedef unsigned long long t1;typedef t1*t2;
20+
-void g(){}
21+
+void g(int,t1 const*,t1,t2,t1 const*,int){}
22+
void h(){}
23+
static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
24+
{t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}

depends/common/gmp/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ else()
5252

5353
externalproject_add(gmp
5454
SOURCE_DIR ${CMAKE_SOURCE_DIR}
55+
PATCH_COMMAND autoreconf -vif
5556
CONFIGURE_COMMAND <SOURCE_DIR>/configure
5657
--prefix=${CMAKE_INSTALL_PREFIX}
5758
--disable-assembly
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
From adfa84dd83f2f2060ee2ebf321c551b2c5d84862 Mon Sep 17 00:00:00 2001
2-
From: Alwin Esch <alwin.esch@web.de>
3-
Date: Sun, 28 May 2023 23:44:50 +0200
4-
Subject: [PATCH 2/2] src-Makefile.in-darwin
1+
From 3b9cd7f9223761b232863a92830e631ff611e188 Mon Sep 17 00:00:00 2001
2+
From: Craig Carnell <1188869+cscd98@users.noreply.github.com>
3+
Date: Mon, 8 Sep 2025 11:21:48 +0100
4+
Subject: [PATCH] Add Darwin-specific install rule
55

66
---
77
src/Makefile.in | 1 +
88
1 file changed, 1 insertion(+)
99

1010
diff --git a/src/Makefile.in b/src/Makefile.in
11-
index 7035316..59d9013 100644
11+
index e8fff47..002f9d1 100644
1212
--- a/src/Makefile.in
1313
+++ b/src/Makefile.in
1414
@@ -113,6 +113,7 @@ install : all force
1515
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
1616
case "@host_os@" in \
1717
hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
1818
+ darwin*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
19-
*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
19+
*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a @LTLIBINTL@ $(DESTDIR)$(libdir)/libiconv.la $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
2020
esac
2121
$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
2222
--
23-
2.40.1
23+
2.51.0
2424

depends/common/iconv/iconv.sha256

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313
1+
3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8

depends/common/iconv/iconv.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
iconv https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz
1+
iconv https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.18.tar.gz

0 commit comments

Comments
 (0)