From nobody Wed Nov 30 14:46:53 2022 X-Original-To: dev-commits-ports-branches@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 4NMhqf0tcLz4hh7H; Wed, 30 Nov 2022 14:46:54 +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 4NMhqf0Gqrz3qlv; Wed, 30 Nov 2022 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669819614; 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=ZD6xdaCqzwYrxOgOa3cUlnoupIu3Eo5DKySr69y6J68=; b=Po7zzCMGFIj33MdDDUE+cyT5/2uRbu9gqdWk3rXExsZYqLGK+mVSZZw1kQtR6qwEKZiFLw CNKlLhYBldSn79ViSdyBuEwCZrj9Q9fqZHG5O8QpYX1s19UCzvvHvOqEwEdnCwQ7Qaftty YR4wtJy9XR0MDAnIa5bcski+H9V1MdD4HUmaBsOBXgN6w7OlGjCahpxqVj1YdaSn6GuYQE ZgE77U7b1Vd9Yw3Dn6WPvRD/zzJ9PekIc0Kr2FakPwuM4XhKK+tMLbmSgt0gmWjJtG14T8 1c+3iFNCfwHFzrB0Cvgque30Q+tU6DIkvXGAb0MYu0xFLUO6q3hX/9y+ks3dlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669819614; 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=ZD6xdaCqzwYrxOgOa3cUlnoupIu3Eo5DKySr69y6J68=; b=rkJUyhT/1dgLFdZdABV2Si9/WAWkwQAGxmtpgas8NbdDi90TDMI+KGXsgZCpQ6fithMyql /6hSjBxEkOdHe1xJ/y3tMBX9QyNCOvNigauCB80xVhzD7mk9Na2gaa6vmmh0F0JEfgTeci V1MqDDPzZtUsbOzPsm0F2pn9EmONDjCTx5RdW8mHvttoxpRLFZmPbcgC9JUZuzbC+dW1xz LLC4w+91i8ryJXRUJiFoRtQC+npUpg0D1TGiQ4r0QP0lIiamTmW2xx1gkU1g4hKa+4X/Qo Aecr1N/8DtBYanS0HzL6+2rfFK+m8Sma6cxuFHXoej9SeYiiB03Ir59+bKdgZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669819614; a=rsa-sha256; cv=none; b=exgFlhVMiXEZm4nsegF2WOeqiesy5WJzCwOTqzE6q4/wFiBZLrCaotPeAI6viWZWEeuQm5 fM9qks8iDzKaAy+aBXCovriPuSKykcEB6z0sM1HA1v30NZhXDSmi3Qb/Y/tADG2TXrhHsw s5fXIM8tA7H18eesMPBVUl53MfdbYPec3QQEkL/3CzM+A9FuaA1Ei6Of4Qn6pl6LzjX3cR vvuorEhztjX29pLEXouV1RPlgggubJHgfVTqXGfii3G6l+bv4hCpN146WWd6GQV1WGtHgz gCJ6PN7xicA615WNJNOVj9Xy1qQbWcNt88YEGVoD/4MwXvj211wpMdNXdkdKCA== 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 4NMhqd6Pp9z110D; Wed, 30 Nov 2022 14:46:53 +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 2AUEkruE048168; Wed, 30 Nov 2022 14:46:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUEkrrQ048167; Wed, 30 Nov 2022 14:46:53 GMT (envelope-from git) Date: Wed, 30 Nov 2022 14:46:53 GMT Message-Id: <202211301446.2AUEkrrQ048167@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 749ca3ec2e60 - 2022Q4 - devel/lightning: Fix build on armv6/armv7 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q4 X-Git-Reftype: branch X-Git-Commit: 749ca3ec2e60189bcce1736c2f44faf54496e958 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=749ca3ec2e60189bcce1736c2f44faf54496e958 commit 749ca3ec2e60189bcce1736c2f44faf54496e958 Author: Robert Clausecker AuthorDate: 2022-11-30 14:34:36 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-11-30 14:46:31 +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 (cherry picked from commit fc86afb83def6fe03212dea1ad2e953daa735847) --- 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) + {