From nobody Wed Nov 30 14:37:27 2022 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 4NMhcl2tTHz4hg2N; Wed, 30 Nov 2022 14:37:27 +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 4NMhcl2MlKz3qMk; Wed, 30 Nov 2022 14:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669819047; 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=O4ySMbObdfhbXqeNx2/Qz0bsMRhq/e2Q6i9DrhO+GOk=; b=w1ihtpj0+MdOAKMKfgxwa8+MQXDc5DeL8mItwMSSxQW8F8gqL7BE6m1ZafbwcQsFAS5QRB dC4LKgVqKYfoh2mnKaoeQ2eIxCvasxMIHQRX/MHJzxlUaeAIlhJEZZ0TLoemQjYGd1xiBB 9XgR0O8TDEYbqktax2AMohx0/QUc9NbNG6zpQ/Z4J9Y6y1AHvsd25tgzEMNY+v2WPnjedD F7hJyZEyPLp0LcgHRCoDYTnUQ8rnGPor/Fwd9etRB7DHnJXXjdd5Ept03u5oDlteSrLuUE P5f0+vkkhPCPxl+spCwxxxo2noB39cg4N6/VMpXePa8tvUpvm10qExrt4Psciw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669819047; 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=O4ySMbObdfhbXqeNx2/Qz0bsMRhq/e2Q6i9DrhO+GOk=; b=IucFjiwcncJy+UF8GdvEb2JG1ECLs88ITLOosr3Q+KLhuoUzFub5YCRkeiQuFGNd8SakTo vXtUwUjOE6ZHf9hBonQ7sDKawhmnbxgTyfxF41jPU3EPhu+kK8TiHgBwBNxiTyld8/kz1Q 3ew41G77m643qhSwUvVeQm/+kEny3E1uNQ6Fz8j5WGkjW8F4Z4qeDPnOyQlufcVVcsiKp6 D/Hi7IW+8X80BedQqF/c0vZ0+jOhVjW6YBUTmhkGUNUFsvc2gwGxSFO3tme7d6CJNqucHu L4MJzs9g0QC89DNbObYiADXOiMka6GVVgoGIcqz4brgUSc+61K9Mtbkc+g453A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669819047; a=rsa-sha256; cv=none; b=l2OWRDK5a7ArttfZuRyzbF93VWaGABFz6KCRsm1o5/8UrKr8ZFBj9ZLLX+AbROq+gs5e5S vn+OwRjXnvhctlllTJ/vr8IcclrAEQdfQi5SQdF5YdqVANdVXAyPIu1VjbjcW3+eXW4oMX iKOEVLKMU7YqB7kyR69CyPo80GTyVN1xAXL+Z9spQ7+95TVChSKvegq/JjRPqGXyFicqUa v/IZQF69TmOguFFelxl2wUV3QgDUQPTgfJho5+pOCR5iGL5V0rhlZw5jHso2y7EYcSctf5 uK8SjH9PsvwmwUb7sJfeVqwZX2zIMLiZiW+l6wS6RaeIhCKpVew4NUrkypGlrg== 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 4NMhcl1QLPz111b; Wed, 30 Nov 2022 14:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AUEbR3I034108; Wed, 30 Nov 2022 14:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUEbRqu034107; Wed, 30 Nov 2022 14:37:27 GMT (envelope-from git) Date: Wed, 30 Nov 2022 14:37:27 GMT Message-Id: <202211301437.2AUEbRqu034107@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: fc86afb83def - main - devel/lightning: Fix build on armv6/armv7 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc86afb83def6fe03212dea1ad2e953daa735847 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc86afb83def6fe03212dea1ad2e953daa735847 commit fc86afb83def6fe03212dea1ad2e953daa735847 Author: Robert Clausecker AuthorDate: 2022-11-30 14:34:36 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-11-30 14:34:36 +0000 devel/lightning: Fix build on armv6/armv7 Fix the problem that made the build fail with LLVM. However, compiling with LLVM still leads to test suite failures on ARM so we compile with gcc instead. The patch for LLVM is left in for if a future version of the library fixes the problem. PR: 268079 Reported by: fuz@fuz.su MFH: 2022Q4 --- devel/lightning/Makefile | 16 ++++++++++++---- devel/lightning/files/patch-check_lightning.c | 11 +++++++++++ devel/lightning/files/patch-lib_jit__arm-swf.c | 20 ++++++++++++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/devel/lightning/Makefile b/devel/lightning/Makefile index c2d441cbfcaf..2bf08dff09ef 100644 --- a/devel/lightning/Makefile +++ b/devel/lightning/Makefile @@ -11,8 +11,6 @@ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 mips powerpc powerpc64 powerpc64le powerpcspe sparc64 -BROKEN_armv6= fails to link: ../lib/.libs/liblightning.so: undefined reference to `__addsf3' -BROKEN_armv7= fails to link: ../lib/.libs/liblightning.so: undefined reference to `__addsf3' USES= cpe libtool pathfix CPE_VENDOR= gnu @@ -22,7 +20,7 @@ INSTALL_TARGET= install-strip TEST_TARGET= check USE_LDCONFIG= yes -PLIST_SUB= JIT_ARCH=${ARCH:S/i386/x86/:S/amd64/x86/:S/x86_64/x86/:S/sparc64/sparc/:C/powerpc.*/ppc/} +PLIST_SUB= JIT_ARCH=${ARCH:S/i386/x86/:S/amd64/x86/:S/x86_64/x86/:S/sparc64/sparc/:C/powerpc.C/ppc/:C/armv./arm/} INFO= lightning @@ -32,4 +30,14 @@ ASSERTIONS_DESC=Enable runtime code generation assertions ASSERTIONS_CONFIGURE_ON=--enable-assertions=yes ASSERTIONS_CONFIGURE_OFF=--enable-assertions=no -.include +.include + +.if ${ARCH:Marmv?} +USE_GCC= yes +.endif + +pre-configure: + @${REINPLACE_CMD} -e \ + 's|%%CC%%|${CC:T}|' ${WRKSRC}/check/lightning.c + +.include diff --git a/devel/lightning/files/patch-check_lightning.c b/devel/lightning/files/patch-check_lightning.c new file mode 100644 index 000000000000..31cad88264e6 --- /dev/null +++ b/devel/lightning/files/patch-check_lightning.c @@ -0,0 +1,11 @@ +--- check/lightning.c.orig 2022-11-08 16:00:32 UTC ++++ check/lightning.c +@@ -4333,7 +4333,7 @@ main(int argc, char *argv[]) + #else + # define cc "gcc" + #endif +- opt_short = snprintf(cmdline, sizeof(cmdline), cc " -E -x c %s", argv[opt_index]); ++ opt_short = snprintf(cmdline, sizeof(cmdline), "%%CC%% -E -x c %s", argv[opt_index]); + opt_short += snprintf(cmdline + opt_short, + sizeof(cmdline) - opt_short, + " -D__WORDSIZE=%d", __WORDSIZE); diff --git a/devel/lightning/files/patch-lib_jit__arm-swf.c b/devel/lightning/files/patch-lib_jit__arm-swf.c new file mode 100644 index 000000000000..f2a77e8f03a1 --- /dev/null +++ b/devel/lightning/files/patch-lib_jit__arm-swf.c @@ -0,0 +1,20 @@ +--- lib/jit_arm-swf.c.orig 2022-11-30 10:43:45 UTC ++++ lib/jit_arm-swf.c +@@ -402,7 +402,7 @@ static void _swf_vaarg_d(jit_state_t*, jit_int32_t, ji + BICI(rt, rn, encode_arm_immediate(im)); \ + } while (0) + +-#if !defined(__GNUC__) ++#if !defined(__GNUC__) || defined(__llvm__) + float __addsf3(float u, float v) + { + return (u + v); +@@ -414,6 +414,8 @@ __adddf3(double u, double v) + return (u + v); + } + ++#endif ++#if !defined(__GNUC__) + float + __aeabi_fsub(float u, float v) + {