From ee86074a964bcc13643cf1d693c0a384132db3f2 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 14 Jul 2020 14:41:31 -0400 Subject: pm 28.11.0-1 rc1, dpkg and rpm bring in 32-bit memory mod for rpm, to match dpkg, from https://forum.palemoon.org/viewtopic.php?f=37&t=24737&p=193746 --- palemoon/debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'palemoon/debian/rules') diff --git a/palemoon/debian/rules b/palemoon/debian/rules index 5705c90..d970f5e 100755 --- a/palemoon/debian/rules +++ b/palemoon/debian/rules @@ -4,6 +4,7 @@ export SHELL=/bin/bash ## borrowed from stevepusser's logic ## Build with gcc-8 on Buster (beowulf/ceres) +## If you enable this, then d/control needs lsb-release as a build dependency. #distrelease := $(shell lsb_release -cs) #ifeq ($(distrelease),$(filter $(distrelease),buster beowulf/ceres)) #export CC=gcc-8 -- cgit From 51735f7a03d9f1e83ed3410b0174dd07ce63b4bb Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 26 Jul 2020 15:22:13 -0400 Subject: try export MOZCONFIG in d/rules --- palemoon/debian/rules | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'palemoon/debian/rules') diff --git a/palemoon/debian/rules b/palemoon/debian/rules index d970f5e..0a5c388 100755 --- a/palemoon/debian/rules +++ b/palemoon/debian/rules @@ -13,6 +13,12 @@ export SHELL=/bin/bash #export LD=gcc-8 #endif +export MOZCONFIG=debian/mozconfig +distrelease := $(shell lsb_release -cs) +ifeq ($(distrelease),$(filter $(distrelease),sid unstable ceres)) +export MOZCONFIG=debian/mozconfig-unstable +endif + %: dh $@ @@ -21,9 +27,6 @@ override_dh_auto_clean: dh_auto_clean find . -name '*.pyc' -delete -override_dh_auto_configure: - cp debian/mozconfig mozconfig - override_dh_auto_build: make -f client.mk build -- cgit From 636b72557da275708a65d32cf9d30acfcd89c485 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 26 Jul 2020 20:02:14 -0400 Subject: use dh_auto_configure for MCFILE --- palemoon/debian/rules | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'palemoon/debian/rules') diff --git a/palemoon/debian/rules b/palemoon/debian/rules index 0a5c388..2efbbcf 100755 --- a/palemoon/debian/rules +++ b/palemoon/debian/rules @@ -13,10 +13,10 @@ export SHELL=/bin/bash #export LD=gcc-8 #endif -export MOZCONFIG=debian/mozconfig +export MCFILE=debian/mozconfig distrelease := $(shell lsb_release -cs) ifeq ($(distrelease),$(filter $(distrelease),sid unstable ceres)) -export MOZCONFIG=debian/mozconfig-unstable +export MCFILE=debian/mozconfig-unstable endif %: @@ -27,6 +27,9 @@ override_dh_auto_clean: dh_auto_clean find . -name '*.pyc' -delete +override_dh_auto_configure: + cp ${MCFILE} mozconfig + override_dh_auto_build: make -f client.mk build -- cgit