svn commit: r481069 - in head: Mk devel/rust-bindgen

[Jan Beich]

Author: jbeich
Date: Mon Oct  1 21:36:37 2018
New Revision: 481069
URL: https://svnweb.freebsd.org/changeset/ports/481069

Log:
  gecko: docouple llvm version from mesa

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/devel/rust-bindgen/Makefile   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Mon Oct  1 21:02:15 2018	(r481068)
+++ head/Mk/bsd.gecko.mk	Mon Oct  1 21:36:37 2018	(r481069)
@@ -102,9 +102,9 @@ USE_XORG+=	xcb
 .endif
 
 .if ${MOZILLA_VER:R:R} >= 56
-MESA_LLVM_VER?=	60
-BUILD_DEPENDS+=	llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}
-MOZ_EXPORT+=	LLVM_CONFIG=llvm-config${MESA_LLVM_VER}
+LLVM_DEFAULT?=	60
+BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
+MOZ_EXPORT+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
 .endif
 
 .if ${MOZILLA_VER:R:R} >= 61

Modified: head/devel/rust-bindgen/Makefile
==============================================================================
--- head/devel/rust-bindgen/Makefile	Mon Oct  1 21:02:15 2018	(r481068)
+++ head/devel/rust-bindgen/Makefile	Mon Oct  1 21:36:37 2018	(r481069)
@@ -12,13 +12,13 @@ COMMENT=	Generate Rust bindings from C (and some C++) 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}
+RUN_DEPENDS=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	rust-lang-nursery
 PLIST_FILES=	bin/bindgen
-MESA_LLVM_VER?=	60
+LLVM_DEFAULT?=	60 # Keep in sync with Mk/bsd.gecko.mk
 
 CARGO_CRATES=	aho-corasick-0.6.4 \
 		ansi_term-0.9.0 \
@@ -70,7 +70,7 @@ CARGO_CRATES=	aho-corasick-0.6.4 \
 		wincolor-0.1.6
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,"llvm-config,&${MESA_LLVM_VER},' \
+	@${REINPLACE_CMD} -e 's,"llvm-config,&${LLVM_DEFAULT},' \
 		${WRKSRC}/cargo-crates/clang-sys-*/build.rs \
 		${WRKSRC}/cargo-crates/clang-sys-*/src/support.rs