Bug#873778: Fix for the mozjs52 build on armel

Adrian Bunk bunk at debian.org
Mon Sep 4 11:45:51 UTC 2017


Changes in this patch:

1. Remove --disable-methodjit, option is no longer available.

Sync compiler flags from firefox-esr:

2. Use -fno-schedule-insns also on armel.

3. Use "-fno-schedule-insns2 -fno-lifetime-dse -fno-delete-null-pointer-checks"
   on all architectures.


--- debian/rules.old	2017-08-31 18:18:31.094300763 +0000
+++ debian/rules	2017-09-04 09:31:01.891585720 +0000
@@ -12,22 +12,19 @@
 
 SRCDIR = $(CURDIR)/js/src
 
-ifeq ($(VENDOR), Debian)
-ifneq (,$(findstring $(DEB_BUILD_ARCH),armel))
-        CONFIGURE_FLAGS += --disable-methodjit
-endif
-endif
-
 ifeq ($(VENDOR), Ubuntu)
 ifneq (,$(findstring $(DEB_BUILD_ARCH),armel armhf))
         CONFIGURE_FLAGS += --enable-thumb2
 endif
 endif
 
-ifneq (,$(findstring $(DEB_BUILD_ARCH),armhf))
-        export DEB_CFLAGS_MAINT_APPEND = -fno-schedule-insns
-        export DEB_CXXFLAGS_MAINT_APPEND = -fno-schedule-insns
+DEB_CFLAGS_MAINT_APPEND += -fno-schedule-insns2 -fno-lifetime-dse -fno-delete-null-pointer-checks
+DEB_CXXFLAGS_MAINT_APPEND += -fno-schedule-insns2 -fno-lifetime-dse -fno-delete-null-pointer-checks
+ifneq (,$(findstring $(DEB_BUILD_ARCH),armel armhf))
+        DEB_CFLAGS_MAINT_APPEND += -fno-schedule-insns
+        DEB_CXXFLAGS_MAINT_APPEND += -fno-schedule-insns
 endif
+export DEB_CFLAGS_MAINT_APPEND DEB_CXXFLAGS_MAINT_APPEND
 
 %:
 	dh $@ --sourcedirectory=$(SRCDIR) --with gnome,pkgkde-symbolshelper --without autoreconf


cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed



More information about the pkg-gnome-maintainers mailing list