Attachment 220661 Details for Bug 251480 – Updated Makefile patch

[patch] Updated Makefile patch

Makefile.diff (text/plain), 1.92 KB, created by Jan Martin Mikkelsen on 2020-12-17 13:04:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Martin Mikkelsen

Created: 2020-12-17 13:04:02 UTC

Size: 1.92 KB

patch

obsolete

>--- lang/spidermonkey78/Makefile
>+++ lang/spidermonkey78/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD: branches/2020Q4/lang/spidermonkey78/Makefile 549549 2020-09-22 01:11:45Z pkubaj $
> 
> PORTNAME=	spidermonkey
>-DISTVERSION=	78.2.0
>+DISTVERSION=	78.6.0
> CATEGORIES=	lang
> MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
> PKGNAMESUFFIX=	${SP_VER}
>@@ -13,8 +13,7 @@
> LICENSE=	MPL20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
>-		${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
>+BUILD_DEPENDS=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
> 		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
> 		autoconf-2.13:devel/autoconf213 \
> 		rust-cbindgen>=0.8.7:devel/rust-cbindgen
>@@ -51,9 +50,6 @@
> CONFIGURE_ENV=	HOST_CC=${CC} \
> 		HOST_CXX=${CXX}
> 
>-CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
>-		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
>-
> BINARY_ALIAS=	python3=${PYTHON_CMD}
> PLIST_SUB=	SP_VER=${SP_VER}
> 
>@@ -66,15 +62,20 @@
> # Require newer Clang than what's in base system unless user opted out
> .if ${CHOSEN_COMPILER_TYPE} == gcc
> USE_GCC=	yes
>-.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
>+.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \
>+	${COMPILER_VERSION} < 100
> CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
> CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
> CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
>+CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
>+		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
> BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
> .endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
>+	@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
>+	    ${WRKSRC}/third_party/rust/*/.cargo-checksum.json
> 
> post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs

Actions: View | Diff

Attachments on bug 251480: 220142 | 220169 | 220170 | 220661 | 220668 | 220669