Graham Perrin <grahamper...@gmail.com> writes:
> On 17/03/2019 16:25, Jan Beich wrote:
>
>> … or add MOZ_OPTIONS+=--disable-stylo to Makefile.local. …
>
> Thanks again. This was one of a handful of keys to success.
>
> ----
>
> One thing puzzles me. I found it necessary to _manually_
> remove the LLVM_CONFIG=llvm-config80 line from:
>
> /usr/ports/www/waterfox/work/Waterfox-56.2.8/.mozconfig
LLVM_CONFIG is added to mozconfig by Mk/bsd.gecko.mk in order to force a
specific version of devel/llvm*. Try the following instead:
Index: Mk/bsd.gecko.mk
===================================================================
--- Mk/bsd.gecko.mk (revision 496825)
+++ Mk/bsd.gecko.mk (working copy)
@@ -92,7 +92,9 @@ CONFIGURE_OUTSOURCE= yes
BUNDLE_LIBS= yes
-.if ${MOZILLA_VER:R:R} >= 56
+.if ${MOZILLA} == waterfox
+MOZ_OPTIONS+= --disable-stylo
+.elif ${MOZILLA_VER:R:R} >= 56
BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
MOZ_EXPORT+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
# Require newer Clang than what's in base system unless user opted out
_______________________________________________
freebsd-gecko@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
