Reorganize mozconfig.in

2 files changed, 31 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f052c2c..45193c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@ source=(palemoon-$pkgver.tar.gz::https://github.com/MoonchildProductions/UXP/arc
         mozconfig.in
         system-libs.patch)
 sha256sums=('c7fd6cbac161957bbca1c861cada556dd853e368cc2122e9a5f1052e72fc659e'
-            'd6a86fbf29a78ef3ca150e48bff7a5c40c0158075cc2c9d6c49470e8a7dedddf'
+            '195907ec47d0d5c41783fdb59084d723131a65bc49e79a7b2ac8cfd5ed33a340'
             '20a037116f85737849b663c61b55fdc7120f83e960ba5b416d70a910de0e9443')
 
 prepare() {
@@ -46,9 +46,8 @@ build() {
 
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
   export MOZCONFIG="$srcdir/mozconfig"
-  export CFLAGS="$CFLAGS -fPIC -fstack-protector-all -flto=4 -O3"
-  export CXXFLAGS="$CXXFLAGS -fPIC -fstack-protector-all -flto=4 -O3"
-  export LDFLAGS="$LDFLAGS,-fuse-ld=gold"
+  export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=4"
+  export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=4"
   python2 mach build
 }
 
diff --git a/mozconfig.in b/mozconfig.in
index e45d044..6010f78 100644
--- a/mozconfig.in
+++ b/mozconfig.in
@@ -1,20 +1,24 @@
-mk_add_options AUTOCLOBBER=1
+#mk_add_options AUTOCLOBBER=1
 mk_add_options MOZ_OBJDIR=%SRCDIR%/pmbuild
 ac_add_options --enable-application=palemoon
 
+# Compiler and Linker
+#ac_add_options --enable-release
 ac_add_options --enable-optimize="-O3 -Wno-format-overflow"
 ac_add_options --disable-elf-hack
+#ac_add_options --enable-strip
+#ac_add_options --enable-install-strip
+export CC=gcc
+export CXX=g++
+export AR=gcc-ar
+export NM=gcc-nm
+export RANLIB=gcc-ranlib
 
+# Branding
 ac_add_options --enable-official-branding
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-av1
-ac_add_options --enable-jemalloc
-#ac_add_options --enable-strip
-#ac_add_options --enable-install-strip
-ac_add_options --with-pthreads
-
+# System libraries
 ac_add_options --with-system-bz2
 #ac_add_options --enable-system-cairo
 ac_add_options --with-system-ffi
@@ -27,34 +31,38 @@ ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --enable-system-pixman
 ac_add_options --with-system-png
+ac_add_options --with-pthreads
 ac_add_options --enable-system-sqlite
 ac_add_options --with-system-zlib
- 
+ac_add_options --x-libraries=/usr/lib
+
+# Features
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-av1
+ac_add_options --enable-jemalloc
+
+# Disables
+ac_add_options --disable-accessibility
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
-ac_add_options --disable-gconf
-ac_add_options --disable-webspeech
-ac_add_options --disable-webspeechtestbackend
-
-ac_add_options --disable-accessibility
 ac_add_options --disable-eme
 ac_add_options --disable-gamepad
+ac_add_options --disable-gconf
 ac_add_options --disable-mozril-geoloc
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-parental-controls
 # # precompiled-startupcache must be disabled to optimize for a newer
 # # instruction set target
 #ac_add_options --disable-precompiled-startupcache
+ac_add_options --disable-synth-speechd
 ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-webrtc
-  
-ac_add_options --x-libraries=/usr/lib
+ac_add_options --disable-webspeech
+ac_add_options --disable-webspeechtestbackend
+
+mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 # Use python2
 mk_add_options PYTHON=/usr/bin/python2
-
-# uncomment the following to limit the number of parallel build jobs
-# remember to run updpkgsums after, or you'll get a checksum failure
-mk_add_options MOZ_MAKE_FLAGS="-j4"