svn commit: r551637 - head/lang/spidermonkey78

Steve Wills swills at FreeBSD.org
Wed Oct 7 13:30:42 UTC 2020


Author: swills
Date: Wed Oct  7 13:30:42 2020
New Revision: 551637
URL: https://svnweb.freebsd.org/changeset/ports/551637

Log:
  lang/spidermonkey78: fix build with local default llvm set to 8.0
  
  by forcing llvm90
  
  PR:		250161
  Reported by:	Philipp Engel <kidon at posteo.de>

Modified:
  head/lang/spidermonkey78/Makefile   (contents, props changed)

Modified: head/lang/spidermonkey78/Makefile
==============================================================================
--- head/lang/spidermonkey78/Makefile	Wed Oct  7 13:29:01 2020	(r551636)
+++ head/lang/spidermonkey78/Makefile	Wed Oct  7 13:30:42 2020	(r551637)
@@ -13,7 +13,7 @@ COMMENT=	Standalone JavaScript based from Mozilla 78-e
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
+BUILD_DEPENDS=	${LOCALBASE}/bin/clang++90:devel/llvm90 \
 		${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
 		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
 		autoconf-2.13:devel/autoconf213 \
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libffi.so:devel/libffi \
 		libicudata.so:devel/icu \
 		libnspr4.so:devel/nspr
 
-USES=		compiler gmake localbase pathfix pkgconfig python:build \
+USES=		compiler:c++17-lang gmake localbase pathfix pkgconfig python:build \
 		readline tar:xz
 USE_LDCONFIG=	yes
 SP_VER=		78
@@ -51,8 +51,8 @@ CONFIGURE_ARGS=	--disable-debug \
 CONFIGURE_ENV=	HOST_CC=${CC} \
 		HOST_CXX=${CXX}
 
-CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
-		LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
+CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config90 \
+		LLVM_OBJDUMP=llvm-objdump90
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PLIST_SUB=	SP_VER=${SP_VER}
@@ -67,10 +67,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 USE_GCC=	yes
 .elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
-CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
-CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
+CPP=		${LOCALBASE}/bin/clang-cpp90
+CC=		${LOCALBASE}/bin/clang90
+CXX=		${LOCALBASE}/bin/clang++90
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang90:devel/llvm90
 .endif
 
 post-patch:


More information about the svn-ports-all mailing list