This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pale-moon. from b79e01c debian/mozconfig: remove autoconf flags that should better be handled by debian/rules. new 08da035 debian/changelog: change to UNRELEASED state. new 850a1c7 debian/rules: add further CC/CXX overrides (if set to the default value). new dc7fc9c debian/rules: move a CFLAGS override section down to the correct place. new 9420799 debian/make.mk: add helper utility from Debian crossstream. new b1acb5d debian/rules: add line that actually exports stuff. new d602c03 debian/rules: add autoconf config.{guess,sub} replacement hack from Debian crossstream. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 9 ++++++++- debian/make.mk | 14 ++++++++++++++ debian/rules | 34 ++++++++++++++++++++++++++-------- 3 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 debian/make.mk -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 08da0350859c2afd5086a96c5b7eb4124d307158 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 30 21:45:28 2018 +0200 debian/changelog: change to UNRELEASED state. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8aaa8f3..e56a5c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -palemoon (27.9.2~repack-1-0x2go1) obs; urgency=medium +palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New downstream version (27.9.2): -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit dc7fc9c8b924538d104faa275450a2a21123a50e Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 30 21:54:26 2018 +0200 debian/rules: move a CFLAGS override section down to the correct place. --- debian/changelog | 1 + debian/rules | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 71dd914..0cb49ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add symbol generations hack for debug-noopt builds. Needs further support for GENSYMBOLS_FLAGS. - Add further CC/CXX overrides (if set to the default value). + - Move a CFLAGS override section down to the correct place. * debian/mozconfig: - Remove autoconf flags that should better be handled by debian/rules. diff --git a/debian/rules b/debian/rules index d25eb82..27a5f99 100755 --- a/debian/rules +++ b/debian/rules @@ -38,15 +38,6 @@ export CPP=cpp-4.9 export LD=gcc-4.9 endif -ifneq (,$(findstring gcc,$(CC))) -ifeq (,$(filter 4.% 5.%,$(shell $(CC) -dumpversion))) -CFLAGS += -fno-schedule-insns2 -fno-lifetime-dse -fno-delete-null-pointer-checks -ifneq (,$(filter armel armhf,$(DEB_BUILD_ARCH))) -CFLAGS += -fno-schedule-insns -endif -endif -endif - ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CONFIGURE_FLAGS += --disable-optimize endif @@ -73,6 +64,15 @@ ifeq (default,$(origin CXX)) CXX := g++ endif +ifneq (,$(findstring gcc,$(CC))) +ifeq (,$(filter 4.% 5.%,$(shell $(CC) -dumpversion))) +CFLAGS += -fno-schedule-insns2 -fno-lifetime-dse -fno-delete-null-pointer-checks +ifneq (,$(filter armel armhf,$(DEB_BUILD_ARCH))) +CFLAGS += -fno-schedule-insns +endif +endif +endif + CXXFLAGS = $(CFLAGS) EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit b1acb5d5921c46c63ce3169f0d6478d36dd61804 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 30 22:41:51 2018 +0200 debian/rules: add line that actually exports stuff. Duh. --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4038557..ade80ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium support for GENSYMBOLS_FLAGS. - Add further CC/CXX overrides (if set to the default value). - Move a CFLAGS override section down to the correct place. + - Add line that actually exports stuff. Duh. * debian/mozconfig: - Remove autoconf flags that should better be handled by debian/rules. * debian/make.mk: diff --git a/debian/rules b/debian/rules index 27a5f99..4902a89 100755 --- a/debian/rules +++ b/debian/rules @@ -76,6 +76,7 @@ endif CXXFLAGS = $(CFLAGS) EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS +$(call lazy,CONFIGURE_ENV,$$(foreach export,$(EXPORTS),$$(export)="$$($$(export))")) %: dh $@ --parallel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit d602c03276d2464548019a4700914821a7067d1e Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 30 23:28:36 2018 +0200 debian/rules: add autoconf config.{guess,sub} replacement hack from Debian crossstream. --- debian/changelog | 2 ++ debian/rules | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index ade80ac..090bd77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add further CC/CXX overrides (if set to the default value). - Move a CFLAGS override section down to the correct place. - Add line that actually exports stuff. Duh. + - Add autoconf config.{guess,sub} replacement hack from Debian + crossstream. * debian/mozconfig: - Remove autoconf flags that should better be handled by debian/rules. * debian/make.mk: diff --git a/debian/rules b/debian/rules index 4902a89..f73e23f 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,8 @@ export CPP=cpp-4.9 export LD=gcc-4.9 endif +AUTOCONF_DIRS := build/autoconf js/src/build/autoconf + ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CONFIGURE_FLAGS += --disable-optimize endif @@ -78,6 +80,14 @@ CXXFLAGS = $(CFLAGS) EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS $(call lazy,CONFIGURE_ENV,$$(foreach export,$(EXPORTS),$$(export)="$$($$(export))")) +stamps/prepare-configure:: stamps/dummy + for dir in $(AUTOCONF_DIRS); do \ + for file in config.guess config.sub; do \ + sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$$file'" "$$@"' $$dir/$$file; \ + done; \ + done + chmod 755 configure js/src/configure + %: dh $@ --parallel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 942079973340e59128701baf6ab252461c36f863 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 30 21:57:27 2018 +0200 debian/make.mk: add helper utility from Debian crossstream. --- debian/changelog | 2 ++ debian/make.mk | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0cb49ac..4038557 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Move a CFLAGS override section down to the correct place. * debian/mozconfig: - Remove autoconf flags that should better be handled by debian/rules. + * debian/make.mk: + - Add helper utility from Debian crossstream. -- Mihai Moldovan <ionic@ionic.de> Mon, 28 May 2018 03:44:10 +0200 diff --git a/debian/make.mk b/debian/make.mk new file mode 100644 index 0000000..3fc6a63 --- /dev/null +++ b/debian/make.mk @@ -0,0 +1,14 @@ +lazy = $(eval $(1) = $$(if $$(___$(1)),,$$(eval ___$(1) := $(2)))$$(___$(1))) +letters = a b c d e f g h i j k l m n o p q r s t u v w x y z +lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1)))))))))))))))))))))))))) +uc = $(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,$(subst f,F,$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,$(subst k,K,$(subst l,L,$(subst m,M,$(subst n,N,$(subst o,O,$(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,$(subst z,Z,$1)))))))))))))))))))))))))) + +__VARS := $(.VARIABLES) + +dump: + @$(foreach var,$(sort $(filter-out $(__VARS) __VARS preprocess ___%,$(.VARIABLES))),echo '$(var) = $(subst ','\'',$(subst \,\\,$($(var))))';) + +dump-%: + @echo $($*) + +.PHONY: dump -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 850a1c797721ee3e433d4cd8b8645e2d8cad9de5 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 30 21:53:53 2018 +0200 debian/rules: add further CC/CXX overrides (if set to the default value). --- debian/changelog | 1 + debian/rules | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index e56a5c5..71dd914 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium CONFIGURE_FLAGS. - Add symbol generations hack for debug-noopt builds. Needs further support for GENSYMBOLS_FLAGS. + - Add further CC/CXX overrides (if set to the default value). * debian/mozconfig: - Remove autoconf flags that should better be handled by debian/rules. diff --git a/debian/rules b/debian/rules index e1a71c3..d25eb82 100755 --- a/debian/rules +++ b/debian/rules @@ -66,6 +66,13 @@ ifeq (,$(filter debug noopt,$(DEB_BUILD_OPTIONS))) GENSYMBOLS_FLAGS := -c4 endif +ifeq (default,$(origin CC)) +CC := gcc +endif +ifeq (default,$(origin CXX)) +CXX := g++ +endif + CXXFLAGS = $(CFLAGS) EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git