Attachment #238447 for bug #268079




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

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.C/ppc/:C/armv./arm/}

INFO=		lightning


ASSERTIONS_CONFIGURE_ON=--enable-assertions=yes
ASSERTIONS_CONFIGURE_OFF=--enable-assertions=no

.include <bsd.port.pre.mk>

.if ${ARCH:Marmv?}
USE_GCC=	yes
.endif

pre-configure:
	@${REINPLACE_CMD} -e \
		's|%%CC%%|${CC:T}|' ${WRKSRC}/check/lightning.c

.include <bsd.port.post.mk>

Added Link Here

(-)b/devel/lightning/files/patch-check_lightning.c (+11 lines)
1	--- check/lightning.c.orig 2022-11-30 11:40:27 UTC
2	+++ check/lightning.c
3	@@ -4190,7 +4190,7 @@ main(int argc, char *argv[])
4	#else
5	# define cc "gcc"
6	#endif
7	- opt_short = snprintf(cmdline, sizeof(cmdline), cc " -E -x c %s", argv[opt_index]);
8	+ opt_short = snprintf(cmdline, sizeof(cmdline), "%%CC%% -E -x c %s", argv[opt_index]);
9	for (++opt_index; opt_index < argc; opt_index++) {
10	if (argv[opt_index][0] == '-')
11	opt_short += snprintf(cmdline + opt_short,




--- 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)
 {

Return to bug 268079

Lines 11-18 LICENSE= LGPL3+ Link Here

(-)b/devel/lightning/Makefile (-6 / +10 lines)
11	LICENSE_FILE= ${WRKSRC}/COPYING.LESSER	11	LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
12		12
13	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 mips powerpc powerpc64 powerpc64le powerpcspe sparc64	13	ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 mips powerpc powerpc64 powerpc64le powerpcspe sparc64
14	BROKEN_armv6= fails to link: ../lib/.libs/liblightning.so: undefined reference to `__addsf3'
15	BROKEN_armv7= fails to link: ../lib/.libs/liblightning.so: undefined reference to `__addsf3'
16		14
17	USES= cpe libtool pathfix	15	USES= cpe libtool pathfix
18	CPE_VENDOR= gnu	16	CPE_VENDOR= gnu
Lines 22-28 INSTALL_TARGET= install-strip Link Here
22	TEST_TARGET= check	20	TEST_TARGET= check
23	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
24		22
25	PLIST_SUB= JIT_ARCH=${ARCH:S/i386/x86/:S/amd64/x86/:S/x86_64/x86/:S/sparc64/sparc/:C/powerpc.*/ppc/}	23	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/}
26		24
27	INFO= lightning	25	INFO= lightning
28		26
Lines 32-39 ASSERTIONS_DESC=Enable runtime code generation assertions Link Here
32	ASSERTIONS_CONFIGURE_ON=--enable-assertions=yes	30	ASSERTIONS_CONFIGURE_ON=--enable-assertions=yes
33	ASSERTIONS_CONFIGURE_OFF=--enable-assertions=no	31	ASSERTIONS_CONFIGURE_OFF=--enable-assertions=no
34		32
35	post-patch:	33	.include <bsd.port.pre.mk>
		34
		35	.if ${ARCH:Marmv?}
		36	USE_GCC= yes
		37	.endif
		38
		39	pre-configure:
36	@${REINPLACE_CMD} -e \	40	@${REINPLACE_CMD} -e \
37	's\|"gcc -E\|"${CC:T} -E\|' ${WRKSRC}/check/lightning.c	41	's\|%%CC%%\|${CC:T}\|' ${WRKSRC}/check/lightning.c
38		42
39	.include <bsd.port.mk>	43	.include <bsd.port.post.mk>

Added Link Here

(-)b/devel/lightning/files/patch-lib_jit__arm-swf.c (-1 / +20 lines)
0	-	1	--- lib/jit_arm-swf.c.orig 2022-11-30 10:43:45 UTC
		2	+++ lib/jit_arm-swf.c
		3	@@ -402,7 +402,7 @@ static void _swf_vaarg_d(jit_state_t*, jit_int32_t, ji
		4	BICI(rt, rn, encode_arm_immediate(im)); \
		5	} while (0)
		6
		7	-#if !defined(__GNUC__)
		8	+#if !defined(__GNUC__) \|\| defined(__llvm__)
		9	float __addsf3(float u, float v)
		10	{
		11	return (u + v);
		12	@@ -414,6 +414,8 @@ __adddf3(double u, double v)
		13	return (u + v);
		14	}
		15
		16	+#endif
		17	+#if !defined(__GNUC__)
		18	float
		19	__aeabi_fsub(float u, float v)
		20	{