From nobody Wed Aug 9 13:04:25 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLVd56cJ6z4pxJ1; Wed, 9 Aug 2023 13:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLVd56368z4Dtd; Wed, 9 Aug 2023 13:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xLSeQBLv3nviCaIbzta6ImQ2HNIktHI2k8jGNznQ71k=; b=hd2hFWebiBiCLLOi5M6ezn0NdRfvWA5C9x0lYT1dRwbPVA7j4+WEjlbt6iAKpfgoWiL0JC Kwc+wmCzf5q3An+////B/+lYCieHnDulL5YyWfSenvuIbw9jA5tgmjQB2Tf03LeT14FJGw 9j49BpKziKZ3qWN7ZoiW+ddCTLVtWZrIeT3Ue/MkVM23cyhg9l2Sf5X6HHPwG3RDJOzq8L V2ja4PTDfLCi3yndocOQuQOMLoMRcUvHX9PVDS3/Dl3va01ifavt00qUtI0L2s3yAZxBPz msieGR9VKWpYRn8y7Jk6fgLsOHg5AumKoLC6kv7JlRwgM8LBHXilJeUrxXMrAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xLSeQBLv3nviCaIbzta6ImQ2HNIktHI2k8jGNznQ71k=; b=O8rjS5cZPctqdPlWEpCLGlYgy+vc0KbsqwIu7vL0JoXLrHk5uU7a2Ue/bTlKhM4PbQ1Cos vnHvYAP75I+btz0rGG0kKbgzmNJlB0kwV97XlGxwDROGjaGeFKweiC+CDSWO8H2RKbHu/y lCXSzmi9hm211zpxRQjoWcSL3mKAVkc5WoEc5DfBzqPL5hQroG4jIH0PQh+VPLbJ0oGyIG 1TnFRnqxg4r1yV1AgKoOhsId9FFUYPZuuR+HwMClFHKwoogvPEj6XUem9vnMS8M8o+O2wd IdM0UzHorxwmTPbTa1DuUckQ+ylyqqiUCb+L0KBbbnkXQVNwPQVMX2XkXbl9tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691586265; a=rsa-sha256; cv=none; b=wQ+cuoD9Bkte5R1pijh/4yicKyleg0AdwjwdvJ5/mibV7/tRyGE7XvfhzgVF8FRtaq3oxw FWvBWtK5E2nW3KRqcVaLbKMt+karB+7Hpl9nvh89G9d0m8dXiq6JOlYnG845qVd0gmQGv1 sgBOThKP05D6NFog4J+oU+pSOBwnxLbVeK/8AHUTSZR/fgE6WKVf5W6l8qgRjwBNdRvfGA l5CRIRcUSR3UPlU2/vTNHm2N6uNYzudGFJy4Tcr7SiDvjP2+V0gAp1sjL29K6jObKKjdis UgKO5mVSIK7g/dElbDvk0O15617VtZ2Hpg9ZFyxc9MvwN8eLDtJsE63JfcjN+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLVd555YSz2Xg; Wed, 9 Aug 2023 13:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379D4P0l089730; Wed, 9 Aug 2023 13:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379D4Pg7089727; Wed, 9 Aug 2023 13:04:25 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:04:25 GMT Message-Id: <202308091304.379D4Pg7089727@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 85fe592a0ce9 - main - lang/guile[23]: prefer long over long long for scm_off_t List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85fe592a0ce9c0d22d19696b0cc915f55f6203d8 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=85fe592a0ce9c0d22d19696b0cc915f55f6203d8 commit 85fe592a0ce9c0d22d19696b0cc915f55f6203d8 Author: Andrew "RhodiumToad" Gierth AuthorDate: 2023-08-06 22:00:30 +0000 Commit: Robert Clausecker CommitDate: 2023-08-09 13:01:14 +0000 lang/guile[23]: prefer long over long long for scm_off_t When long and long long are both the same size as off_t, prefer long for scm_off_t even though it should make no difference, because llvm16 seems to consider them distinct types as arguments in function pointer types. Also it seems cleaner. fixes mailutils with GUILE=on on llvm16 on amd64. Fixes: 94218d3a91189c7afea956e8905d5e5ecf879a2c PR: 260960 --- lang/guile2/Makefile | 2 +- lang/guile2/files/patch-libguile_gen-scmconfig.c | 2 +- lang/guile3/Makefile | 1 + lang/guile3/files/patch-libguile_gen-scmconfig.c | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile index 7236fa11e2c1..37694221837c 100644 --- a/lang/guile2/Makefile +++ b/lang/guile2/Makefile @@ -1,6 +1,6 @@ PORTNAME= guile DISTVERSION= 2.2.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang scheme MASTER_SITES= GNU PKGNAMESUFFIX= 2 diff --git a/lang/guile2/files/patch-libguile_gen-scmconfig.c b/lang/guile2/files/patch-libguile_gen-scmconfig.c index db1dd3fc9113..b72e32681a5d 100644 --- a/lang/guile2/files/patch-libguile_gen-scmconfig.c +++ b/lang/guile2/files/patch-libguile_gen-scmconfig.c @@ -12,7 +12,7 @@ pf ("typedef int scm_t_off;\n"); pf ("#define SCM_T_OFF_MAX INT_MAX\n"); pf ("#define SCM_T_OFF_MIN INT_MIN\n"); -+#elif SIZEOF_OFF_T == SIZEOF_LONG_LONG ++#elif SIZEOF_OFF_T == SIZEOF_LONG_LONG && SIZEOF_OFF_T != SIZEOF_LONG + pf ("typedef long long int scm_t_off;\n"); + pf ("#define SCM_T_OFF_MAX LLONG_MAX\n"); + pf ("#define SCM_T_OFF_MIN LLONG_MIN\n"); diff --git a/lang/guile3/Makefile b/lang/guile3/Makefile index b1ec1c837217..d2021c03c8bd 100644 --- a/lang/guile3/Makefile +++ b/lang/guile3/Makefile @@ -1,5 +1,6 @@ PORTNAME?= guile PORTVERSION= 3.0.9 +PORTREVISION= 1 CATEGORIES= lang scheme MASTER_SITES= GNU PKGNAMESUFFIX?= 3 diff --git a/lang/guile3/files/patch-libguile_gen-scmconfig.c b/lang/guile3/files/patch-libguile_gen-scmconfig.c index 88080e540e4f..ba32f1ab317d 100644 --- a/lang/guile3/files/patch-libguile_gen-scmconfig.c +++ b/lang/guile3/files/patch-libguile_gen-scmconfig.c @@ -1,10 +1,10 @@ ---- libguile/gen-scmconfig.c.orig 2021-03-09 19:24:59 UTC +--- libguile/gen-scmconfig.c.orig 2022-10-21 15:39:38 UTC +++ libguile/gen-scmconfig.c -@@ -343,6 +343,10 @@ main (int argc, char *argv[]) +@@ -329,6 +329,10 @@ main (int argc, char *argv[]) pf ("typedef int scm_t_off;\n"); pf ("#define SCM_T_OFF_MAX INT_MAX\n"); pf ("#define SCM_T_OFF_MIN INT_MIN\n"); -+#elif SIZEOF_OFF_T == SIZEOF_LONG_LONG ++#elif SIZEOF_OFF_T == SIZEOF_LONG_LONG && SIZEOF_OFF_T != SIZEOF_LONG + pf ("typedef long long int scm_t_off;\n"); + pf ("#define SCM_T_OFF_MAX LLONG_MAX\n"); + pf ("#define SCM_T_OFF_MIN LLONG_MIN\n");