Attachment 215961 Details for Bug 247421 – Fix PR 247421 by not building runtime.so when compiler is Clang >= 10

[patch] Fix PR 247421 by not building runtime.so when compiler is Clang >= 10

smlnj.patch.20200626 (text/plain), 4.90 KB, created by Johannes 5 on 2020-06-26 15:06:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes 5

Created: 2020-06-26 15:06:00 UTC

Size: 4.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 540489)
>+++ Makefile	(working copy)
>@@ -31,8 +31,19 @@
> EVERYTHING_DESC=	install everything from the SML/NJ distribution
> RECOMPILE_DESC=		recompile the SML compiler - implies EVERYTHING
> 
>+USES=	compiler
>+
> .include <bsd.port.pre.mk>
> 
>+# XXX see FreeBSD PR 247421
>+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 100
>+RUNTIME_SO=
>+PLIST_SUB+=	RUNTIME_SO="@comment "
>+.else
>+RUNTIME_SO=	"${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}.so"
>+PLIST_SUB+=	RUNTIME_SO=
>+.endif
>+
> .if (${ARCH} == "i386")
> MLARCH=		x86
> MLSIZE=		32
>@@ -332,7 +343,7 @@
> 	MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \
> 	( eval $${MLARCHOPSYS} ; \
> 	${STRIP_CMD} "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" \
>-	  "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}.so" )
>+	  ${RUNTIME_SO} )
> .if ${PORT_OPTIONS:MEVERYTHING}
> 	@${ECHO} '(* Cleaning base/runtime: *)'
> 	cd ${WRKSRC}/base/runtime/objs && ${MAKE_CMD} clean
>Index: files/do-patch-base_runtime_objs_mk.amd64-freebsd
>===================================================================
>--- files/do-patch-base_runtime_objs_mk.amd64-freebsd	(revision 540489)
>+++ files/do-patch-base_runtime_objs_mk.amd64-freebsd	(working copy)
>@@ -28,5 +28,5 @@
> -#	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
> -#	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
> +	($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
>-+	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
>++	-($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
> +	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
>Index: files/do-patch-base_runtime_objs_mk.x86-freebsd
>===================================================================
>--- files/do-patch-base_runtime_objs_mk.x86-freebsd	(revision 540489)
>+++ files/do-patch-base_runtime_objs_mk.x86-freebsd	(working copy)
>@@ -39,5 +39,5 @@
> -#	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
> -#	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
> +	($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
>-+	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
>++	-($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
> +	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 540489)
>+++ pkg-plist	(working copy)
>@@ -18,7 +18,7 @@
> smlnj/bin/.link-sml
> smlnj/bin/.run/run.%%MLARCH%%-freebsd
> smlnj/bin/.run/run.%%MLARCH%%-freebsd.a
>-smlnj/bin/.run/run.%%MLARCH%%-freebsd.so
>+%%RUNTIME_SO%%smlnj/bin/.run/run.%%MLARCH%%-freebsd.so
> smlnj/bin/.run-sml
> smlnj/bin/asdlgen
> smlnj/bin/heap2asm

Flags:

joemann: maintainer-approval+

Actions: View | Diff

Attachments on bug 247421: 215961 | 216263