pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

squeak5-vm: fix build with gcc14



Module Name:	pkgsrc-wip
Committed By:	Atsushi Toyokura <asteria.at%gmail.com@localhost>
Pushed By:	steleto
Date:		Sun Jan 18 19:40:20 2026 +0900
Changeset:	500f3e1c203fbaba42e90d89e5a10b1f3ee66ed9

Modified Files:
	squeak5-vm/Makefile
	squeak5-vm/distinfo
	squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c
Added Files:
	squeak5-vm/patches/patch-building_linux64x64_squeak.cog.spur_build_mvm

Log Message:
squeak5-vm: fix build with gcc14

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=500f3e1c203fbaba42e90d89e5a10b1f3ee66ed9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 squeak5-vm/Makefile                                      |  2 --
 squeak5-vm/distinfo                                      |  3 ++-
 .../patch-building_linux64x64_squeak.cog.spur_build_mvm  | 16 ++++++++++++++++
 squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c  |  6 +++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diffs:
diff --git a/squeak5-vm/Makefile b/squeak5-vm/Makefile
index 2f1d517e25..3acdad436c 100644
--- a/squeak5-vm/Makefile
+++ b/squeak5-vm/Makefile
@@ -21,8 +21,6 @@ USE_TOOLS+=	autoreconf autoconf automake pkg-config bash pax
 AUTOCONF_REQD=	2.69
 USE_LIBTOOL=	yes
 
-NO_CONFIGURE=	yes
-
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-build
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
diff --git a/squeak5-vm/distinfo b/squeak5-vm/distinfo
index 4076852386..c41a79ebcf 100644
--- a/squeak5-vm/distinfo
+++ b/squeak5-vm/distinfo
@@ -3,6 +3,7 @@ $NetBSD$
 BLAKE2s (opensmalltak-vm-202312181441.tar.gz) = 35efe327e9d0e8673573744a0d1ef3d6f415ccf8816bb5dbfc1278d537f60f1a
 SHA512 (opensmalltak-vm-202312181441.tar.gz) = d253d01e33fceaaf5713e96e747e877458272e78469b776c2e57c28e1429a2797954535857694d06ec96d4e054743d67bc57bc73d19d107c7fb5753df422e0c8
 Size (opensmalltak-vm-202312181441.tar.gz) = 55030856 bytes
+SHA1 (patch-building_linux64x64_squeak.cog.spur_build_mvm) = ca310dc2cf25bacadadaccdaddb00fe3e01db7a5
 SHA1 (patch-platforms_Cross_plugins_SqueakFFIPrims_sqFFIPlugin.c) = 7c2b933ca02d032f76e076f6b9f98510a06af12e
 SHA1 (patch-platforms_unix_config_bin.squeak.sh.in) = eca83ca07948b5abce150bd4be4b5a7a8e1630eb
 SHA1 (patch-platforms_unix_config_configure.ac) = 465b211778a8d70bc2d030f0e8987f0e48edc1c2
@@ -15,5 +16,5 @@ SHA1 (patch-platforms_unix_vm-display-X11_acinclude.m4) = 6fe2caffdcafa00185102d
 SHA1 (patch-platforms_unix_vm_include__ucontext.h) = ef722fe06ac5e565e9303a7467cbee1b23f9d0bd
 SHA1 (patch-platforms_unix_vm_sqUnixITimerHeartbeat.c) = 96b6f1094b07c9456f9b6cc56b2bc7237e6c24f0
 SHA1 (patch-platforms_unix_vm_sqUnixITimerTickerHeartbeat.c) = 2714da2e76226d5194a07ad1ea5ead3edc39d7fd
-SHA1 (patch-platforms_unix_vm_sqUnixMain.c) = f000e949fde87f81fdada5be84a40a9842a1d1bd
+SHA1 (patch-platforms_unix_vm_sqUnixMain.c) = 4990908bca9221ed18a4c4f93ee653a4828e4098
 SHA1 (patch-src_spur64.cog_cogitX64SysV.c) = f0a60621d6bfc3aa101da95d1fa354829f3e5d56
diff --git a/squeak5-vm/patches/patch-building_linux64x64_squeak.cog.spur_build_mvm b/squeak5-vm/patches/patch-building_linux64x64_squeak.cog.spur_build_mvm
new file mode 100644
index 0000000000..c6adfcdd2b
--- /dev/null
+++ b/squeak5-vm/patches/patch-building_linux64x64_squeak.cog.spur_build_mvm
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- building/linux64x64/squeak.cog.spur/build/mvm.orig	2023-12-18 14:41:18.000000000 +0000
++++ building/linux64x64/squeak.cog.spur/build/mvm
+@@ -16,6 +16,11 @@ case $(uname -s) in
+            ;;
+ esac
+ 
++CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration"
++CFLAGS="${CFLAGS} -Wno-error=incompatible-pointer-types"
++CFLAGS="${CFLAGS} -Wno-error=int-conversion"
++#CFLAGS="${CFLAGS} -Wno-error=return-mismatch"
++
+ # Prefer clang over gcc, but use gcc if clang isn't available...
+ CC=gcc
+ if [ -x /usr/bin/clang ]; then CC=clang; fi
diff --git a/squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c b/squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c
index 13ce2ececd..c6e64b6208 100644
--- a/squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c
+++ b/squeak5-vm/patches/patch-platforms_unix_vm_sqUnixMain.c
@@ -1,13 +1,13 @@
 $NetBSD$
 
---- platforms/unix/vm/sqUnixMain.c.orig	2022-06-02 14:10:44.000000000 +0000
+--- platforms/unix/vm/sqUnixMain.c.orig	2025-12-16 16:09:40.000000000 +0000
 +++ platforms/unix/vm/sqUnixMain.c
-@@ -999,6 +999,19 @@ printRegisterState(FILE *file,ucontext_t
+@@ -1042,6 +1042,19 @@ printRegisterState(FILE *file,ucontext_t
  			v(regs[REG_R12]),v(regs[REG_R13]),v(regs[REG_R14]),v(regs[REG_R15]),
  			v(regs[REG_RIP]));
  	return v(regs[REG_RIP]);
 +#elif __NetBSD__ && __x86_64__
-+	__greg_t *regs = &uap->uc_mcontext.__gregs;
++	__gregset_t *regs = &uap->uc_mcontext.__gregs;
 +	printf(	"\trax 0x%08lx rbx 0x%08lx rcx 0x%08lx rdx 0x%08lx\n"
 +			"\trdi 0x%08lx rsi 0x%08lx rbp 0x%08lx rsp 0x%08lx\n"
 +			"\tr8  0x%08lx r9  0x%08lx r10 0x%08lx r11 0x%08lx\n"


Home | Main Index | Thread Index | Old Index