Merge branch 'master' into f26
This commit is contained in:
commit
957147e501
@ -1,6 +1,6 @@
|
||||
. $topsrcdir/browser/config/mozconfig
|
||||
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk3
|
||||
|
||||
ac_add_options --prefix="$PREFIX"
|
||||
ac_add_options --libdir="$LIBDIR"
|
||||
@ -20,7 +20,6 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
||||
ac_add_options --with-google-api-keyfile=../google-api-key
|
||||
ac_add_options --enable-release
|
||||
ac_add_options --enable-pie
|
||||
ac_add_options --with-gl-provider=EGL
|
||||
# Workaround for mozbz#1341234
|
||||
ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
|
||||
|
||||
|
@ -433,6 +433,9 @@ echo "ac_add_options --disable-ion" >> .mozconfig
|
||||
echo "ac_add_options --disable-stylo" >> .mozconfig
|
||||
%endif
|
||||
|
||||
# Remove executable bit to make brp-mangle-shebangs happy.
|
||||
chmod -x third_party/rust/itertools/src/lib.rs
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%build
|
||||
|
Loading…
Reference in New Issue
Block a user