Prepare for llvm-config in base and use ports llvm-config to avoid a
build error.

checking for llvm-config... /usr/bin/llvm-config
ERROR: Could not find the clang shared library in the path /usr/lib
returned by `llvm-config --libdir` (searched for files []).
clang is required to build Firefox.  Please install the
necessary packages, or run `mach bootstrap`.

Index: www/mozilla-firefox/Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.371
diff -u -p -r1.371 Makefile
--- www/mozilla-firefox/Makefile        13 Feb 2019 12:33:40 -0000      1.371
+++ www/mozilla-firefox/Makefile        3 Mar 2019 02:12:21 -0000
@@ -43,6 +43,7 @@ MOZILLA_USE_BUNDLED_HUNSPELL = Yes
 BUILD_DEPENDS +=       lang/rust
 # stylo build needs LLVM
 BUILD_DEPENDS +=       devel/llvm
+MAKE_ENV +=            LLVM_CONFIG="${LOCALBASE}/bin/llvm-config"
 # 61 requires both versions of python
 BUILD_DEPENDS +=       lang/python/${MODPY_DEFAULT_VERSION_3}
 # 63 requires node because why not #1483595
Index: www/firefox-esr/Makefile
===================================================================
RCS file: /cvs/ports/www/firefox-esr/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- www/firefox-esr/Makefile    22 Feb 2019 19:36:21 -0000      1.90
+++ www/firefox-esr/Makefile    3 Mar 2019 02:12:21 -0000
@@ -42,6 +42,7 @@ MOZILLA_USE_BUNDLED_HUNSPELL = Yes
 BUILD_DEPENDS +=       lang/rust
 # stylo build needs LLVM
 BUILD_DEPENDS +=       devel/llvm
+MAKE_ENV +=            LLVM_CONFIG="${LOCALBASE}/bin/llvm-config"
 
 WANTLIB += X11-xcb Xcursor Xi fribidi intl xcb xcb-shm ${COMPILER_LIBCXX}
 
Index: www/tor-browser/browser/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- www/tor-browser/browser/Makefile    8 Oct 2018 15:28:05 -0000       1.30
+++ www/tor-browser/browser/Makefile    3 Mar 2019 02:12:21 -0000
@@ -52,6 +52,7 @@ MOZILLA_USE_BUNDLED_SQLITE =  Yes
 BUILD_DEPENDS +=       lang/rust
 # stylo build needs LLVM
 BUILD_DEPENDS +=       devel/llvm
+MAKE_ENV +=            LLVM_CONFIG="${LOCALBASE}/bin/llvm-config"
 
 WANTLIB += X11-xcb Xcursor Xi fribidi intl xcb xcb-shm ${COMPILER_LIBCXX}
 

Reply via email to