pkgsrc-WIP-changes archive

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

lang/spark2014: Update to 13.0.0nb1



Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By:	dkazankov
Date:		Fri May 31 23:34:06 2024 +0300
Changeset:	acf8f9494686546e5ec983944260c4918153b798

Modified Files:
	spark2014/Makefile
	spark2014/distinfo
Added Files:
	spark2014/patches/patch-src_common_semaphores__c.c

Log Message:
lang/spark2014: Update to 13.0.0nb1

* GCC base moved to 13.3 release
* Fixed POSIX semaphore creation runtime error

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

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

diffstat:
 spark2014/Makefile                                 |  5 +-
 spark2014/distinfo                                 |  7 ++-
 spark2014/patches/patch-src_common_semaphores__c.c | 73 ++++++++++++++++++++++
 3 files changed, 80 insertions(+), 5 deletions(-)

diffs:
diff --git a/spark2014/Makefile b/spark2014/Makefile
index 19915ce02d..474454268d 100644
--- a/spark2014/Makefile
+++ b/spark2014/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2024/05/02 14:00:00 dkazankov Exp $
+# $NetBSD: Makefile,v 1.2 2024/05/31 14:00:00 dkazankov Exp $
 
 .include "version.mk"
 PKGNAME=	spark2014-${SPARK2014_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang devel
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/AdaCore/spark2014
@@ -29,7 +30,7 @@ GITHUB_SUBMODULES+=	AdaCore	cvc5	98b5fb70e8a94fd258bfc959c4a6fd0cc3537564	cvc5
 GITHUB_SUBMODULES+=	AdaCore	why3	52b6a590ba9bfc64aa0d22b41715358f26124a1f	why3
 GITHUB_SUBMODULES+=	AdaCore	z3	7e79f0deb7c9d43f7637113be5b99391f14fcc2e	z3
 
-GCC_DIST_VERSION=	13.2.0
+GCC_DIST_VERSION=	13.3.0
 GCC_DISTNAME=		gcc-${GCC_DIST_VERSION}
 GCC_EXTRACT_SUFFIX=	.tar.xz
 GCC_DISTFILE=		${GCC_DISTNAME}${GCC_EXTRACT_SUFFIX}
diff --git a/spark2014/distinfo b/spark2014/distinfo
index 00d3e97070..05f7848b6d 100644
--- a/spark2014/distinfo
+++ b/spark2014/distinfo
@@ -12,9 +12,9 @@ Size (AdaCore-why3-52b6a590ba9bfc64aa0d22b41715358f26124a1f.tar.gz) = 7196387 by
 BLAKE2s (AdaCore-z3-7e79f0deb7c9d43f7637113be5b99391f14fcc2e.tar.gz) = 91b6519eca90397b0246e03e2f3b9dbf19f42a110d60c70b36b7efeb8ad94b8a
 SHA512 (AdaCore-z3-7e79f0deb7c9d43f7637113be5b99391f14fcc2e.tar.gz) = 0289f45b63cb1fedcae374b2b35ca308488e628c3516ee8c129bd6b43ebd6141aa7c5bae52b3d63c4db7068326c3566eed76acb059e4efb1f1dc694fc8647ced
 Size (AdaCore-z3-7e79f0deb7c9d43f7637113be5b99391f14fcc2e.tar.gz) = 5237981 bytes
-BLAKE2s (gcc-13.2.0.tar.xz) = 89847ac474d00cde32fbcae20154f8aedff9c66158faf95ad7a78cc9a190d4c4
-SHA512 (gcc-13.2.0.tar.xz) = d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2
-Size (gcc-13.2.0.tar.xz) = 87858592 bytes
+BLAKE2s (gcc-13.3.0.tar.xz) = d204b8987b4780b569f28226cbfff34ae27124e529857c36ff90d5d40ef0b511
+SHA512 (gcc-13.3.0.tar.xz) = ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801
+Size (gcc-13.3.0.tar.xz) = 87909952 bytes
 BLAKE2s (spark2014-13.0.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 32b2081dfd7bbb4442bc791848cc4900a8cb9214e69fce6b55ef3724b2c9b145
 SHA512 (spark2014-13.0.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 17644c49e642b2e79cfe481414d12df5b27bad003cdabbb0c9e88f5eb1f8b705b159791612a2d5f720e67017f0867ffaa5cfa0bc5fae8188442cd15fb456890b
 Size (spark2014-13.0.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 11924977 bytes
@@ -22,6 +22,7 @@ SHA1 (patch-Makefile) = 9157605f7a801b9a6efc91277610db77b5017b79
 SHA1 (patch-gnatprove.gpr) = 4fdad2117e0c5c68eb526fd9958ed3aad395ae9b
 SHA1 (patch-spark2014vsn.ads) = 602aa8c17a6cb67342ac09f3c88b7516b5af5ffb
 SHA1 (patch-src_common_platform.ads) = 4ff7b14c8811cecfa9fce51b813257c2e6a1efe1
+SHA1 (patch-src_common_semaphores__c.c) = ded64d4445bea8f05135ca179462cb5ed59ecfe9
 SHA1 (patch-src_common_x86__64-netbsd_platform.adb) = 44abca7d7c65a762e393cad9de0013d6949339e9
 SHA1 (patch-src_gnatprove_spark__report.adb) = ebea33ff633f24cee09188cbbded4b12deeaba1c
 SHA1 (patch-why3_Makefile.in) = 6172e55a5263ac19248916db57da4b7a387fdd7d
diff --git a/spark2014/patches/patch-src_common_semaphores__c.c b/spark2014/patches/patch-src_common_semaphores__c.c
new file mode 100644
index 0000000000..b7b0d518e2
--- /dev/null
+++ b/spark2014/patches/patch-src_common_semaphores__c.c
@@ -0,0 +1,73 @@
+$NetBSD: patch-src_common_semaphores__c.c,v 1.0 2024/05/31 14:00:00 dkazankov Exp $
+
+Fix runtime error caused semaphore names on NetBSD
+
+--- src/common/semaphores_c.c.orig	2023-01-05 11:22:11.000000000 +0200
++++ src/common/semaphores_c.c	2024-05-31 22:33:16.871296137 +0300
+@@ -30,8 +30,33 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#if defined (__NetBSD__)
++char* __netbsd_sem_name(const char *name) {
++  size_t len = strlen (name);
++  char *sem_name = calloc (len+2, sizeof(char));
++  if (sem_name == NULL) {
++    return (char *) name;
++  }
++  char *p = sem_name;
++  if (len > 0 && name[0] != '/') {
++    sem_name[0] = '/';
++    p++;
++  }
++  strcpy (p, name);
++  return sem_name;
++}
++#endif
++
+ sem_t* create_semaphore (const char *name, unsigned int init) {
++#if defined (__NetBSD__)
++  char *sem_name = __netbsd_sem_name (name);
++  sem_t* r = sem_open (sem_name, O_CREAT | O_EXCL, 0600, init);
++  if (sem_name != name) {
++    free (sem_name);
++  }
++#else
+   sem_t* r = sem_open (name, O_CREAT | O_EXCL, 0600, init);
++#endif
+   if (r == SEM_FAILED) {
+     perror("failed to create semaphore");
+     exit(1);
+@@ -40,7 +65,15 @@
+ }
+ 
+ sem_t* open_semaphore (const char *name) {
++#if defined (__NetBSD__)
++  char *sem_name = __netbsd_sem_name (name);
++  sem_t* r = sem_open (sem_name, 0);
++  if (sem_name != name) {
++    free (sem_name);
++  }
++#else
+   sem_t* r = sem_open (name, 0);
++#endif
+   if (r == SEM_FAILED) {
+     perror("failed to open semaphore");
+     exit(1);
+@@ -70,7 +103,16 @@
+ }
+ 
+ void delete_semaphore (const char *name) {
++#if defined (__NetBSD__)
++  char *sem_name = __netbsd_sem_name (name);
++  int r = sem_unlink (sem_name);
++  if (sem_name != name) {
++    free (sem_name);
++  }
++  if (r == -1) {
++#else
+   if (sem_unlink(name) == -1) {
++#endif
+     //  ignore errors of deleting on purpose
+   }
+ }


Home | Main Index | Thread Index | Old Index