Unverified Commit e6fb26f5 authored by boklm's avatar boklm
Browse files

Update mozconfig files

Update the mozconfig files with the changes from the versions in
tor-browser.git. We are currently not using the mozconfig files from
tor-browser.git directly as we need to modify some of them.
parent 846dae99
......@@ -5,10 +5,6 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
# Use jemalloc 4.x. In 52ESR, we should use
# the --enable-jemalloc=4 flag instead:
export MOZ_JEMALLOC4=1
export CFLAGS=-m32
export CXXFLAGS=-m32
export LDFLAGS=-m32
......@@ -21,8 +17,10 @@ ac_add_options --enable-optimize
#ac_add_options --disable-optimize
ac_add_options --enable-official-branding
# Let's support GTK2 for ESR52
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --enable-tor-browser-update
ac_add_options --enable-update-packaging
ac_add_options --enable-signmar
ac_add_options --enable-verify-mar
......@@ -34,7 +32,6 @@ ac_add_options --disable-maintenance-service
ac_add_options --disable-crashreporter
ac_add_options --disable-webrtc
# Let's not compile EME at least until we can enable ClearKey and only Clearkey.
# (Apart from that there is no Adobe CRM module for Linux right now)
ac_add_options --disable-eme
#ac_add_options --disable-ctypes
ac_add_options --disable-loop
ac_add_options --enable-jemalloc=4
......@@ -5,16 +5,14 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
# Use jemalloc 4.x. In 52ESR, we should use
# the --enable-jemalloc=4 flag instead:
export MOZ_JEMALLOC4=1
ac_add_options --enable-optimize
#ac_add_options --disable-optimize
ac_add_options --enable-official-branding
# Let's support GTK2 for ESR52
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --enable-tor-browser-update
ac_add_options --enable-update-packaging
ac_add_options --enable-signmar
ac_add_options --enable-verify-mar
......@@ -26,7 +24,6 @@ ac_add_options --disable-maintenance-service
ac_add_options --disable-crashreporter
ac_add_options --disable-webrtc
# Let's not compile EME at least until we can enable ClearKey and only Clearkey.
# (Apart from that there is no Adobe CRM module for Linux right now)
ac_add_options --disable-eme
#ac_add_options --disable-ctypes
ac_add_options --disable-loop
ac_add_options --enable-jemalloc=4
......@@ -18,7 +18,7 @@ export AR=${TOOLCHAIN_PREFIX}ar
export RANLIB=${TOOLCHAIN_PREFIX}ranlib
export STRIP=${TOOLCHAIN_PREFIX}strip
export OTOOL=${TOOLCHAIN_PREFIX}otool
export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil"
export HOST_CC="$TOOLCHAIN_DIR/clang/helpers/clang"
export HOST_CXX="$TOOLCHAIN_DIR/clang/helpers/clang++"
......@@ -43,7 +43,6 @@ ac_add_options --disable-debug
ac_add_options --enable-tor-browser-data-outside-app-dir
ac_add_options --enable-tor-browser-update
ac_add_options --enable-update-packaging
ac_add_options --enable-signmar
ac_add_options --enable-verify-mar
......@@ -55,4 +54,3 @@ ac_add_options --disable-tests
# (Apart from that there is no Adobe CRM module for OS X right now)
ac_add_options --disable-eme
# ac_add_options --disable-ctypes
ac_add_options --disable-loop
......@@ -2,6 +2,7 @@ CROSS_COMPILE=1
ac_add_options --enable-application=browser
ac_add_options --target=i686-w64-mingw32
ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
ac_add_options --enable-default-toolkit=cairo-windows
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw
mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
......@@ -14,7 +15,6 @@ ac_add_options --enable-strip
ac_add_options --enable-official-branding
ac_add_options --enable-tor-browser-update
ac_add_options --enable-update-packaging
ac_add_options --enable-signmar
ac_add_options --enable-verify-mar
......@@ -27,6 +27,3 @@ ac_add_options --disable-crashreporter
ac_add_options --disable-maintenance-service
ac_add_options --disable-webrtc
ac_add_options --disable-tests
#ac_add_options --disable-ctypes
ac_add_options --disable-loop
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment