From nobody Tue Jul 18 12:12:07 2023 X-Original-To: dev-commits-ports-main@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 4R4yVv5mq7z4nSGr; Tue, 18 Jul 2023 12:12:07 +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 4R4yVv5LvKz4KXv; Tue, 18 Jul 2023 12:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689682327; 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=vM02zz5MdvgtM0v8NaUB4/u4HnMSGfNDjW2ThdIfijM=; b=h7PQA9FMuANaCIo8UD+ksxJfvo+ivNLrveUrrhFz53fqjp/Usrxs86Q6zdCNrwjnk0piKg Q9KKqvU0v6QC3pD1sxJOnTy5btp3fR0bVhmPgul+Dt4L+Q83C7ygF39ZsvnHmXVmQwBLW9 g0tu/R2y0lIIzw/mrDTZv2gBzoXTh+G7Q0M7JUevUbBNuKUitIoVeSMfKeEmfyORahYP3d ug8cji8ZSaxamq4EZy1q5f39bG2yEKhlOpygnAbpzaOUdPVctuEJcVtBaYbTaPWEP9/AYS +UarfKOPnKD/l3x4Pf4sGBfvABY/d7w1BH8dG+xxdEwc8I0gBCQem4wmVppm6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689682327; 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=vM02zz5MdvgtM0v8NaUB4/u4HnMSGfNDjW2ThdIfijM=; b=rNa9z52Vl5zbDZH93jK9cyDKIPPu6KnDJh20Ygtf5/HUFSuErQXb5XY9OPmW2rkhjTYRtg CkLHmLZM/nrWaIBIhrEPqjTCpiuuKQap04PXSCRtc9aFzwBgtpYs11vLYhht+03hDAXG8w 4F7utK7hqKpWnfZ1bdLEkZpGBVgqJi9XXfVLe8Yx1YHyPWiTB2A9/D7KdnsFPW1XFhehKR JWmmEF/ciLrgngB1FJzFKSKpmxSwCYCLzMGGBdsv0MYQi6VmtvFlKFEvcsac+OGMU5pJ2v GFrKlKU6Q+iZfvgwOj7vEDU2FLaAuUuFR4IaxmxKpd+Znp6qEAVOPALY5H2bdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689682327; a=rsa-sha256; cv=none; b=D96VcbH+2JbamsTgyJVYN+3I/ONpH+DU7JHDiHTrSVOBoihF4Os3phBERhhcYgSEIYcHF6 nO0iJBofd1OL52IpgukJwdXG8xSqtCiBAFnUCqbemNniFtMxxPUI4AebQlt9EoRU++k/8o 5VR/qGZHWsW7uFc87POmBQXn2tbJDqQ3/ik8CfUJD5k0A/ZaAd3h3hkoLZ1+8zFm1/vlNO jK2yFZU97sVgejsH5HWdrBxKHh1I4KpL436yn67ci3rc247QoF56foQB9IC99AWLCILIXV HGQ6VRmyEPRImaFR+Dg7SbGh4bOd536tAO2HwjVQFkA/Lc2a5BddaIJN0kFPaQ== 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 4R4yVv4M1wz153d; Tue, 18 Jul 2023 12:12:07 +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 36ICC7KR015670; Tue, 18 Jul 2023 12:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36ICC73G015669; Tue, 18 Jul 2023 12:12:07 GMT (envelope-from git) Date: Tue, 18 Jul 2023 12:12:07 GMT Message-Id: <202307181212.36ICC73G015669@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vasil Dimov Subject: git: b8e169236717 - main - net-p2p/c-lightning: attempt to unbreak on arm64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8e16923671765b348a064824656e0cd04809d1b Auto-Submitted: auto-generated The branch main has been updated by vd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8e16923671765b348a064824656e0cd04809d1b commit b8e16923671765b348a064824656e0cd04809d1b Author: Vasil Dimov AuthorDate: 2023-07-18 12:08:16 +0000 Commit: Vasil Dimov CommitDate: 2023-07-18 12:11:42 +0000 net-p2p/c-lightning: attempt to unbreak on arm64 Since arm64 uses two's complement (char)0xff is the same as -1. Changing to use the latter should silence this compiler error: ccan/ccan/base64/base64.c:34:10: error: result of comparison of constant 255 with expression of type 'int8_t' (aka 'signed char') is always false [-Werror,-Wtautological-constant-out-of-range-compare] if (ret == (char)0xff) { ~~~ ^ ~~~~~~~~~~ --- net-p2p/c-lightning/Makefile | 4 +++ .../files/extra-patch-ccan_ccan_base64_base64.c | 29 ++++++++++++++++++++++ ...nal_libwally-core_src_ccan_ccan_base64_base64.c | 29 ++++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile index d452d849b054..851ab2407a4e 100644 --- a/net-p2p/c-lightning/Makefile +++ b/net-p2p/c-lightning/Makefile @@ -34,6 +34,10 @@ BINARY_ALIAS= python=${PYTHON_CMD} python3=${PYTHON_CMD} ALL_TARGET= default SHEBANG_FILES= tools/reckless +EXTRA_PATCHES_arm64= ${FILESDIR}/extra-patch-ccan_ccan_base64_base64.c \ + ${FILESDIR}/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c +EXTRA_PATCHES= ${EXTRA_PATCHES_${ARCH}} + OPTIONS_DEFINE= COMPATIBILITY DEVELOPER EXPERIMENTAL OPTIONS_MULTI= STORAGE OPTIONS_MULTI_STORAGE= POSTGRESQL SQLITE diff --git a/net-p2p/c-lightning/files/extra-patch-ccan_ccan_base64_base64.c b/net-p2p/c-lightning/files/extra-patch-ccan_ccan_base64_base64.c new file mode 100644 index 000000000000..c29c8cb458ae --- /dev/null +++ b/net-p2p/c-lightning/files/extra-patch-ccan_ccan_base64_base64.c @@ -0,0 +1,29 @@ +--- ccan/ccan/base64/base64.c.orig 2023-07-18 11:01:33 UTC ++++ ccan/ccan/base64/base64.c +@@ -31,7 +31,7 @@ static int8_t sixbit_from_b64(const base64_maps_t *map + int8_t ret; + + ret = maps->decode_map[(unsigned char)b64letter]; +- if (ret == (char)0xff) { ++ if (ret == -1) { + errno = EDOM; + return -1; + } +@@ -41,7 +41,7 @@ bool base64_char_in_alphabet(const base64_maps_t *maps + + bool base64_char_in_alphabet(const base64_maps_t *maps, const char b64char) + { +- return (maps->decode_map[(const unsigned char)b64char] != (char)0xff); ++ return (maps->decode_map[(const unsigned char)b64char] != -1); + } + + void base64_init_maps(base64_maps_t *dest, const char src[64]) +@@ -49,7 +49,7 @@ void base64_init_maps(base64_maps_t *dest, const char + unsigned char i; + + memcpy(dest->encode_map,src,64); +- memset(dest->decode_map,0xff,256); ++ memset(dest->decode_map,-1,256); + for (i=0; i<64; i++) { + dest->decode_map[(unsigned char)src[i]] = i; + } diff --git a/net-p2p/c-lightning/files/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c b/net-p2p/c-lightning/files/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c new file mode 100644 index 000000000000..d577ba598d09 --- /dev/null +++ b/net-p2p/c-lightning/files/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c @@ -0,0 +1,29 @@ +--- external/libwally-core/src/ccan/ccan/base64/base64.c.orig 2023-07-18 11:13:39 UTC ++++ external/libwally-core/src/ccan/ccan/base64/base64.c +@@ -34,7 +34,7 @@ static int8_t sixbit_from_b64(const base64_maps_t *map + int8_t ret; + + ret = maps->decode_map[(unsigned char)b64letter]; +- if (ret == (char)0xff) { ++ if (ret == -1) { + errno = EDOM; + return -1; + } +@@ -44,7 +44,7 @@ bool base64_char_in_alphabet(const base64_maps_t *maps + + bool base64_char_in_alphabet(const base64_maps_t *maps, const char b64char) + { +- return (maps->decode_map[(const unsigned char)b64char] != (char)0xff); ++ return (maps->decode_map[(const unsigned char)b64char] != -1); + } + + void base64_init_maps(base64_maps_t *dest, const char src[64]) +@@ -52,7 +52,7 @@ void base64_init_maps(base64_maps_t *dest, const char + unsigned char i; + + memcpy(dest->encode_map,src,64); +- memset(dest->decode_map,0xff,256); ++ memset(dest->decode_map,-1,256); + for (i=0; i<64; i++) { + dest->decode_map[(unsigned char)src[i]] = i; + }