View | Details | Raw Unified | Return to bug 251480 | Differences between
and this patch

Collapse All | Expand All

(-)lang/spidermonkey78/Makefile (-7 / +8 lines)
Lines 1-7 Link Here
1
# $FreeBSD: branches/2020Q4/lang/spidermonkey78/Makefile 549549 2020-09-22 01:11:45Z pkubaj $
1
# $FreeBSD: branches/2020Q4/lang/spidermonkey78/Makefile 549549 2020-09-22 01:11:45Z pkubaj $
2
2
3
PORTNAME=	spidermonkey
3
PORTNAME=	spidermonkey
4
DISTVERSION=	78.2.0
4
DISTVERSION=	78.6.0
5
CATEGORIES=	lang
5
CATEGORIES=	lang
6
MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
6
MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
7
PKGNAMESUFFIX=	${SP_VER}
7
PKGNAMESUFFIX=	${SP_VER}
Lines 13-20 Link Here
13
LICENSE=	MPL20
13
LICENSE=	MPL20
14
LICENSE_FILE=	${WRKSRC}/LICENSE
14
LICENSE_FILE=	${WRKSRC}/LICENSE
15
15
16
BUILD_DEPENDS=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
16
BUILD_DEPENDS=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
17
		${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
18
		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
17
		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
19
		autoconf-2.13:devel/autoconf213 \
18
		autoconf-2.13:devel/autoconf213 \
20
		rust-cbindgen>=0.8.7:devel/rust-cbindgen
19
		rust-cbindgen>=0.8.7:devel/rust-cbindgen
Lines 51-59 Link Here
51
CONFIGURE_ENV=	HOST_CC=${CC} \
50
CONFIGURE_ENV=	HOST_CC=${CC} \
52
		HOST_CXX=${CXX}
51
		HOST_CXX=${CXX}
53
52
54
CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
55
		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
56
57
BINARY_ALIAS=	python3=${PYTHON_CMD}
53
BINARY_ALIAS=	python3=${PYTHON_CMD}
58
PLIST_SUB=	SP_VER=${SP_VER}
54
PLIST_SUB=	SP_VER=${SP_VER}
59
55
Lines 66-80 Link Here
66
# Require newer Clang than what's in base system unless user opted out
62
# Require newer Clang than what's in base system unless user opted out
67
.if ${CHOSEN_COMPILER_TYPE} == gcc
63
.if ${CHOSEN_COMPILER_TYPE} == gcc
68
USE_GCC=	yes
64
USE_GCC=	yes
69
.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
65
.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \
66
	${COMPILER_VERSION} < 100
70
CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
67
CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
71
CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
68
CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
72
CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
69
CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
70
CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
71
		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
73
BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
72
BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
74
.endif
73
.endif
75
74
76
post-patch:
75
post-patch:
77
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
76
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
77
	@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
78
	    ${WRKSRC}/third_party/rust/*/.cargo-checksum.json
78
79
79
post-install:
80
post-install:
80
	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
81
	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs

Return to bug 251480