From 73df46c30ed676ec02fee2f09f04e5e592402a28 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Thu, 23 Jul 2020 10:17:55 -0400
Subject: use lsb_release = sid for -j1 compile flag

---
 palemoon/debian/mozconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'palemoon/debian/mozconfig')

diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig
index 6513132..d1ceb6f 100644
--- a/palemoon/debian/mozconfig
+++ b/palemoon/debian/mozconfig
@@ -50,6 +50,10 @@ ac_add_options --enable-alsa
 # primarily for 32-bit but tolerated for 64-bit
 ac_add_options --x-libraries=/usr/lib
 
-# TESTING FOR OBS
+if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then
+# single-threaded for sid because of jobserver problem in OBS
+mk_add_options MOZ_MAKE_FLAGS="-j1"
+else
 # limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread)
 mk_add_options MOZ_MAKE_FLAGS="-j4"
+fi
-- 
cgit 


From fba4407a782eb5c718f7d65e00e134039e1b5e09 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Thu, 23 Jul 2020 11:51:30 -0400
Subject: do only an export in the shell "if" statement

---
 palemoon/debian/mozconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'palemoon/debian/mozconfig')

diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig
index d1ceb6f..93f26cd 100644
--- a/palemoon/debian/mozconfig
+++ b/palemoon/debian/mozconfig
@@ -52,8 +52,9 @@ ac_add_options --x-libraries=/usr/lib
 
 if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then
 # single-threaded for sid because of jobserver problem in OBS
-mk_add_options MOZ_MAKE_FLAGS="-j1"
+export JCOUNT=1
 else
 # limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread)
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+export JCOUNT=4
 fi
+mk_add_options MOZ_MAKE_FLAGS="-j${JCOUNT}"
-- 
cgit 


From bafbb8d345bd2ee9fd67fbd3618b94758ea7f10a Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Thu, 23 Jul 2020 14:02:42 -0400
Subject: try new layout for mozconfig for -j flag

---
 palemoon/debian/mozconfig | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'palemoon/debian/mozconfig')

diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig
index 93f26cd..3b78f53 100644
--- a/palemoon/debian/mozconfig
+++ b/palemoon/debian/mozconfig
@@ -1,3 +1,11 @@
+if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then
+# single-threaded for sid because of jobserver problem in OBS
+export JCOUNT=1
+else
+# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread)
+export JCOUNT=4
+fi
+
 mk_add_options AUTOCLOBBER=1
 export BUILDING_RELEASE=1
 export MC_OFFICIAL=1
@@ -50,11 +58,4 @@ ac_add_options --enable-alsa
 # primarily for 32-bit but tolerated for 64-bit
 ac_add_options --x-libraries=/usr/lib
 
-if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then
-# single-threaded for sid because of jobserver problem in OBS
-export JCOUNT=1
-else
-# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread)
-export JCOUNT=4
-fi
-mk_add_options MOZ_MAKE_FLAGS="-j${JCOUNT}"
+mk_add_options MOZ_MAKE_FLAGS=-j${JCOUNT}
-- 
cgit 


From 917a213b9cc2488a553951f7dfe9f4133c756100 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Thu, 23 Jul 2020 14:21:46 -0400
Subject: adjust mozconfig again

---
 palemoon/debian/mozconfig | 2 --
 1 file changed, 2 deletions(-)

(limited to 'palemoon/debian/mozconfig')

diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig
index 3b78f53..89b2796 100644
--- a/palemoon/debian/mozconfig
+++ b/palemoon/debian/mozconfig
@@ -1,8 +1,6 @@
 if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then
-# single-threaded for sid because of jobserver problem in OBS
 export JCOUNT=1
 else
-# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread)
 export JCOUNT=4
 fi
 
-- 
cgit 


From 51735f7a03d9f1e83ed3410b0174dd07ce63b4bb Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Sun, 26 Jul 2020 15:22:13 -0400
Subject: try export MOZCONFIG in d/rules

---
 palemoon/debian/mozconfig | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'palemoon/debian/mozconfig')

diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig
index 89b2796..445c209 100644
--- a/palemoon/debian/mozconfig
+++ b/palemoon/debian/mozconfig
@@ -1,9 +1,3 @@
-if test `lsb_release -sc` = "sid" || test `lsb_release -sc` = "unstable" ; then
-export JCOUNT=1
-else
-export JCOUNT=4
-fi
-
 mk_add_options AUTOCLOBBER=1
 export BUILDING_RELEASE=1
 export MC_OFFICIAL=1
@@ -56,4 +50,5 @@ ac_add_options --enable-alsa
 # primarily for 32-bit but tolerated for 64-bit
 ac_add_options --x-libraries=/usr/lib
 
-mk_add_options MOZ_MAKE_FLAGS=-j${JCOUNT}
+# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread)
+mk_add_options MOZ_MAKE_FLAGS="-j4"
-- 
cgit