diff -Nru firefox-esr-102.3.0esr/debian/changelog firefox-esr-102.3.0esr/debian/changelog --- firefox-esr-102.3.0esr/debian/changelog 2022-09-20 21:58:15.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/changelog 2022-09-26 05:42:10.000000000 +0000 @@ -1,3 +1,37 @@ +firefox-esr (102.3.0esr-1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green at Wed, 05 Dec 2018 06:56:52 +0000] + * Hack broken rust target selection so it produces the right target + on raspbian. + * Fix clean target. + + [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green] + * Use a fake homedir for build (Closes: 933757). + + [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green] + * Disable webrtc, it seems to fail to build on raspbian. + * Try to disable Neon + + [changes introduced in 78.3.0esr-2+rpi1 by Peter Michael Green] + * Clean up pycache directories. + * Disable neon in qcms. + + [changes brought over from thunderbird 1:91.3.2-1+rpi1 by Peter Michael Green] + * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting + definitions error. + + [changes brought over from thunderbird 1:102.1.1-1+rpi1 by Peter Michael Green] + * Disable more armv7/neon stuff. + + [changes introduced in 102.2.0esr-1+rpi1 by Peter Michael Green] + * Disable jit (or at least try to) + + Pass disable-jit from debian/rules + + Nerf jit detection in s/moz.configure + + Disable arm atomics (which require armv7) in js/src/jit/GenerateAtomicOperations.py + + Remove architecture restrictions in jit/shared/AtomicOperations-feeling-lucky-gcc.h + + -- Raspbian forward porter Mon, 26 Sep 2022 05:42:10 +0000 + firefox-esr (102.3.0esr-1) unstable; urgency=medium * New upstream release. diff -Nru firefox-esr-102.3.0esr/debian/control firefox-esr-102.3.0esr/debian/control --- firefox-esr-102.3.0esr/debian/control 2022-09-20 21:58:15.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/control 2022-09-26 05:42:10.000000000 +0000 @@ -712,11 +712,11 @@ Section: localization Depends: ${misc:Depends}, firefox-esr (>= ${source:Version}), firefox-esr (<< ${source:Version}.1~) -Description: Central Khmer language package for Firefox ESR +Description: Khmer language package for Firefox ESR Firefox ESR is a powerful, extensible web browser with support for modern web application technologies. . - This package contains the localization of Firefox ESR in Central Khmer. + This package contains the localization of Firefox ESR in Khmer. Package: firefox-esr-l10n-kn Architecture: all diff -Nru firefox-esr-102.3.0esr/debian/l10n/browser-l10n.control firefox-esr-102.3.0esr/debian/l10n/browser-l10n.control --- firefox-esr-102.3.0esr/debian/l10n/browser-l10n.control 2022-09-20 21:58:15.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/l10n/browser-l10n.control 2022-09-26 05:42:10.000000000 +0000 @@ -318,7 +318,7 @@ %include @PRODUCT@-l10n.control.in %define L10N_LANG km -%define L10N_LANGUAGE Central Khmer +%define L10N_LANGUAGE Khmer %undef L10N_RECOMMENDS %define L10N_TRANSITION 1 %include @PRODUCT@-l10n.control.in diff -Nru firefox-esr-102.3.0esr/debian/patches/disable-jit.patch firefox-esr-102.3.0esr/debian/patches/disable-jit.patch --- firefox-esr-102.3.0esr/debian/patches/disable-jit.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/patches/disable-jit.patch 2022-09-26 05:42:10.000000000 +0000 @@ -0,0 +1,96 @@ +From: Peter Michael Green +Date: Tue, 20 Sep 2022 21:54:38 +0000 +X-Dgit-Generated: 102.2.0esr-1+rpi1 e351c33a6ff4b5d2ff37573db2b0b8e6df0a0b8a +Subject: Disable jit. + + +--- + +diff --git a/js/moz.configure b/js/moz.configure +index 7a241cac76d..a040b58407f 100644 +--- a/js/moz.configure ++++ b/js/moz.configure +@@ -154,18 +154,18 @@ set_define("ENABLE_RECORD_TUPLE", enable_record_tuple) + # ======================================================= + @depends(target, "--enable-record-tuple") + def jit_default(target, enable_record_tuple): +- if enable_record_tuple: +- return False +- if target.cpu in ( +- "x86", +- "x86_64", +- "arm", +- "aarch64", +- "mips32", +- "mips64", +- "loongarch64", +- ): +- return True ++ #if enable_record_tuple: ++ # return False ++ #if target.cpu in ( ++ # "x86", ++ # "x86_64", ++ # "arm", ++ # "aarch64", ++ # "mips32", ++ # "mips64", ++ # "loongarch64", ++ #): ++ # return True + return False + + +diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py +index d8a38a0bbbc..63878e99a74 100644 +--- a/js/src/jit/GenerateAtomicOperations.py ++++ b/js/src/jit/GenerateAtomicOperations.py +@@ -32,13 +32,13 @@ def gen_seqcst(fun_name): + }""" % { + "fun_name": fun_name, + } +- if cpu_arch == "arm": +- return r""" +- INLINE_ATTR void %(fun_name)s() { +- asm volatile ("dmb sy\n\t" ::: "memory"); +- }""" % { +- "fun_name": fun_name, +- } ++ #if cpu_arch == "arm": ++ # return r""" ++ # INLINE_ATTR void %(fun_name)s() { ++ # asm volatile ("dmb sy\n\t" ::: "memory"); ++ # }""" % { ++ # "fun_name": fun_name, ++ # } + raise Exception("Unexpected arch") + + +@@ -721,7 +721,7 @@ namespace jit { + + def generate_atomics_header(c_out): + contents = "" +- if cpu_arch in ("x86", "x86_64", "arm", "aarch64"): ++ if cpu_arch in ("x86", "x86_64", "aarch64"): + contents += "#define JS_HAVE_GENERATED_ATOMIC_OPS 1" + + # `fence` performs a full memory barrier. +diff --git a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h +index 2e384337a31..e532d8813dc 100644 +--- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h ++++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h +@@ -30,10 +30,10 @@ + + // Explicitly exclude tier-1 platforms. + +-#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \ +- defined(_M_IX86) || defined(__arm__) || defined(__aarch64__)) +-# error "Do not use on a tier-1 platform where inline assembly is available" +-#endif ++//#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \ ++// defined(_M_IX86) || defined(__arm__) || defined(__aarch64__)) ++//# error "Do not use on a tier-1 platform where inline assembly is available" ++//#endif + + #if !(defined(__clang__) || defined(__GNUC__)) + # error "This file only for gcc/Clang" diff -Nru firefox-esr-102.3.0esr/debian/patches/disable-more-armv7neon-stuff.patch firefox-esr-102.3.0esr/debian/patches/disable-more-armv7neon-stuff.patch --- firefox-esr-102.3.0esr/debian/patches/disable-more-armv7neon-stuff.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/patches/disable-more-armv7neon-stuff.patch 2022-09-26 05:42:10.000000000 +0000 @@ -0,0 +1,488 @@ +From: Peter Michael Green +Date: Sat, 27 Aug 2022 08:00:25 +0000 +X-Dgit-Generated: 102.2.0esr-1+rpi1 987d60ce9ec74082bc02f5eb0e346ebe9bbd7e83 +Subject: Disable more armv7/neon stuff. + + +--- + +diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build +index c643fbaf406..e715f1a94fc 100644 +--- a/gfx/ycbcr/moz.build ++++ b/gfx/ycbcr/moz.build +@@ -53,13 +53,13 @@ else: + 'yuv_row_other.cpp', + ] + +-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']: +- SOURCES += [ +- 'yuv_row_arm.s', +- ] +- SOURCES += [ +- 'yuv_convert_arm.cpp', +- ] ++#if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']: ++# SOURCES += [ ++# 'yuv_row_arm.s', ++# ] ++# SOURCES += [ ++# 'yuv_convert_arm.cpp', ++# ] + + LOCAL_INCLUDES += ['/media/libyuv/libyuv/include'] + +diff --git a/media/libaom/moz.build b/media/libaom/moz.build +index db3f9ca6eca..8396b55851f 100644 +--- a/media/libaom/moz.build ++++ b/media/libaom/moz.build +@@ -42,26 +42,6 @@ elif CONFIG['CPU_ARCH'] == 'x86': + ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ] + LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ] + EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ] +-elif CONFIG['CPU_ARCH'] == 'arm': +- EXPORTS.aom += files['ARM_EXPORTS'] +- ASFLAGS += [ +- '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR, +- '-I%s/libaom' % OBJDIR, +- ] +- LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ] +- EXPORTS.aom += [ 'config/linux/arm/config/aom_config.h' ] +- +- SOURCES += files['ARM_SOURCES'] +- +- for f in SOURCES: +- if f.endswith('neon.c'): +- SOURCES[f].flags += CONFIG['NEON_FLAGS'] +- +- if CONFIG['OS_TARGET'] == 'Android': +- # For cpu-features.h +- LOCAL_INCLUDES += [ +- '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'], +- ] + else: + # Generic C-only configuration + EXPORTS.aom += files['GENERIC_EXPORTS'] +diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild +index 672d48bf24d..9caf5295726 100644 +--- a/media/libaom/sources.mozbuild ++++ b/media/libaom/sources.mozbuild +@@ -1,118 +1,6 @@ + # This file is generated. Do not edit. + + files = { +- 'ARM_EXPORTS': [ +- '../../third_party/aom/aom/aom.h', +- '../../third_party/aom/aom/aom_codec.h', +- '../../third_party/aom/aom/aom_decoder.h', +- '../../third_party/aom/aom/aom_encoder.h', +- '../../third_party/aom/aom/aom_frame_buffer.h', +- '../../third_party/aom/aom/aom_image.h', +- '../../third_party/aom/aom/aom_integer.h', +- '../../third_party/aom/aom/aomcx.h', +- '../../third_party/aom/aom/aomdx.h', +- '../../third_party/aom/aom_mem/aom_mem.h', +- '../../third_party/aom/aom_ports/aom_timer.h', +- '../../third_party/aom/aom_ports/arm.h', +- '../../third_party/aom/aom_ports/bitops.h', +- '../../third_party/aom/aom_ports/mem.h', +- '../../third_party/aom/aom_ports/sanitizer.h', +- '../../third_party/aom/aom_ports/system_state.h', +- '../../third_party/aom/aom_scale/aom_scale.h', +- '../../third_party/aom/aom_scale/yv12config.h', +- ], +- 'ARM_SOURCES': [ +- '../../third_party/aom/aom/src/aom_codec.c', +- '../../third_party/aom/aom/src/aom_decoder.c', +- '../../third_party/aom/aom/src/aom_encoder.c', +- '../../third_party/aom/aom/src/aom_image.c', +- '../../third_party/aom/aom/src/aom_integer.c', +- '../../third_party/aom/aom_dsp/aom_convolve.c', +- '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c', +- '../../third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c', +- '../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c', +- '../../third_party/aom/aom_dsp/arm/intrapred_neon.c', +- '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c', +- '../../third_party/aom/aom_dsp/arm/subtract_neon.c', +- '../../third_party/aom/aom_dsp/binary_codes_reader.c', +- '../../third_party/aom/aom_dsp/bitreader_buffer.c', +- '../../third_party/aom/aom_dsp/bitwriter_buffer.c', +- '../../third_party/aom/aom_dsp/blend_a64_hmask.c', +- '../../third_party/aom/aom_dsp/blend_a64_mask.c', +- '../../third_party/aom/aom_dsp/blend_a64_vmask.c', +- '../../third_party/aom/aom_dsp/daalaboolreader.c', +- '../../third_party/aom/aom_dsp/entcode.c', +- '../../third_party/aom/aom_dsp/entdec.c', +- '../../third_party/aom/aom_dsp/fft.c', +- '../../third_party/aom/aom_dsp/grain_synthesis.c', +- '../../third_party/aom/aom_dsp/intrapred.c', +- '../../third_party/aom/aom_dsp/loopfilter.c', +- '../../third_party/aom/aom_dsp/subtract.c', +- '../../third_party/aom/aom_mem/aom_mem.c', +- '../../third_party/aom/aom_ports/arm_cpudetect.c', +- '../../third_party/aom/aom_scale/aom_scale_rtcd.c', +- '../../third_party/aom/aom_scale/generic/aom_scale.c', +- '../../third_party/aom/aom_scale/generic/gen_scalers.c', +- '../../third_party/aom/aom_scale/generic/yv12config.c', +- '../../third_party/aom/aom_scale/generic/yv12extend.c', +- '../../third_party/aom/aom_util/aom_thread.c', +- '../../third_party/aom/aom_util/debug_util.c', +- '../../third_party/aom/av1/av1_dx_iface.c', +- '../../third_party/aom/av1/common/alloccommon.c', +- '../../third_party/aom/av1/common/arm/av1_inv_txfm_neon.c', +- '../../third_party/aom/av1/common/arm/av1_txfm_neon.c', +- '../../third_party/aom/av1/common/arm/blend_a64_hmask_neon.c', +- '../../third_party/aom/av1/common/arm/blend_a64_vmask_neon.c', +- '../../third_party/aom/av1/common/arm/cfl_neon.c', +- '../../third_party/aom/av1/common/arm/convolve_neon.c', +- '../../third_party/aom/av1/common/arm/jnt_convolve_neon.c', +- '../../third_party/aom/av1/common/arm/reconinter_neon.c', +- '../../third_party/aom/av1/common/arm/selfguided_neon.c', +- '../../third_party/aom/av1/common/arm/warp_plane_neon.c', +- '../../third_party/aom/av1/common/arm/wiener_convolve_neon.c', +- '../../third_party/aom/av1/common/av1_inv_txfm1d.c', +- '../../third_party/aom/av1/common/av1_inv_txfm2d.c', +- '../../third_party/aom/av1/common/av1_loopfilter.c', +- '../../third_party/aom/av1/common/av1_rtcd.c', +- '../../third_party/aom/av1/common/av1_txfm.c', +- '../../third_party/aom/av1/common/blockd.c', +- '../../third_party/aom/av1/common/cdef.c', +- '../../third_party/aom/av1/common/cdef_block.c', +- '../../third_party/aom/av1/common/cdef_block_neon.c', +- '../../third_party/aom/av1/common/cfl.c', +- '../../third_party/aom/av1/common/convolve.c', +- '../../third_party/aom/av1/common/debugmodes.c', +- '../../third_party/aom/av1/common/entropy.c', +- '../../third_party/aom/av1/common/entropymode.c', +- '../../third_party/aom/av1/common/entropymv.c', +- '../../third_party/aom/av1/common/frame_buffers.c', +- '../../third_party/aom/av1/common/idct.c', +- '../../third_party/aom/av1/common/mvref_common.c', +- '../../third_party/aom/av1/common/obu_util.c', +- '../../third_party/aom/av1/common/odintrin.c', +- '../../third_party/aom/av1/common/pred_common.c', +- '../../third_party/aom/av1/common/quant_common.c', +- '../../third_party/aom/av1/common/reconinter.c', +- '../../third_party/aom/av1/common/reconintra.c', +- '../../third_party/aom/av1/common/resize.c', +- '../../third_party/aom/av1/common/restoration.c', +- '../../third_party/aom/av1/common/scale.c', +- '../../third_party/aom/av1/common/scan.c', +- '../../third_party/aom/av1/common/seg_common.c', +- '../../third_party/aom/av1/common/thread_common.c', +- '../../third_party/aom/av1/common/tile_common.c', +- '../../third_party/aom/av1/common/timing.c', +- '../../third_party/aom/av1/common/txb_common.c', +- '../../third_party/aom/av1/common/warped_motion.c', +- '../../third_party/aom/av1/decoder/decodeframe.c', +- '../../third_party/aom/av1/decoder/decodemv.c', +- '../../third_party/aom/av1/decoder/decoder.c', +- '../../third_party/aom/av1/decoder/decodetxb.c', +- '../../third_party/aom/av1/decoder/detokenize.c', +- '../../third_party/aom/av1/decoder/dthread.c', +- '../../third_party/aom/av1/decoder/obu.c', +- '../../third_party/aom/av1/encoder/arm/neon/quantize_neon.c', +- ], + 'GENERIC_EXPORTS': [ + '../../third_party/aom/aom/aom.h', + '../../third_party/aom/aom/aom_codec.h', +diff --git a/media/libvpx/sources.mozbuild b/media/libvpx/sources.mozbuild +index e9d687a1c79..f8ddd6675d0 100644 +--- a/media/libvpx/sources.mozbuild ++++ b/media/libvpx/sources.mozbuild +@@ -536,249 +536,6 @@ files = { + 'libvpx/vpx_scale/vpx_scale_rtcd.c', + 'libvpx/vpx_util/vpx_thread.c', + 'libvpx/vpx_util/vpx_write_yuv_frame.c', +-], +- 'ARM_EXPORTS': [ +- 'libvpx/vpx/vp8.h', +- 'libvpx/vpx/vp8cx.h', +- 'libvpx/vpx/vp8dx.h', +- 'libvpx/vpx/vpx_codec.h', +- 'libvpx/vpx/vpx_decoder.h', +- 'libvpx/vpx/vpx_encoder.h', +- 'libvpx/vpx/vpx_ext_ratectrl.h', +- 'libvpx/vpx/vpx_frame_buffer.h', +- 'libvpx/vpx/vpx_image.h', +- 'libvpx/vpx/vpx_integer.h', +- 'libvpx/vpx_mem/include/vpx_mem_intrnl.h', +- 'libvpx/vpx_mem/vpx_mem.h', +- 'libvpx/vpx_ports/arm.h', +- 'libvpx/vpx_ports/bitops.h', +- 'libvpx/vpx_ports/compiler_attributes.h', +- 'libvpx/vpx_ports/mem.h', +- 'libvpx/vpx_ports/static_assert.h', +- 'libvpx/vpx_ports/system_state.h', +- 'libvpx/vpx_ports/vpx_timer.h', +- 'libvpx/vpx_scale/vpx_scale.h', +- 'libvpx/vpx_scale/yv12config.h', +-], +- 'ARM_SOURCES': [ +- 'libvpx/vp8/common/alloccommon.c', +- 'libvpx/vp8/common/arm/loopfilter_arm.c', +- 'libvpx/vp8/common/arm/neon/bilinearpredict_neon.c', +- 'libvpx/vp8/common/arm/neon/copymem_neon.c', +- 'libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c', +- 'libvpx/vp8/common/arm/neon/dequant_idct_neon.c', +- 'libvpx/vp8/common/arm/neon/dequantizeb_neon.c', +- 'libvpx/vp8/common/arm/neon/idct_blk_neon.c', +- 'libvpx/vp8/common/arm/neon/iwalsh_neon.c', +- 'libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c', +- 'libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c', +- 'libvpx/vp8/common/arm/neon/mbloopfilter_neon.c', +- 'libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c', +- 'libvpx/vp8/common/arm/neon/sixtappredict_neon.c', +- 'libvpx/vp8/common/arm/neon/vp8_loopfilter_neon.c', +- 'libvpx/vp8/common/blockd.c', +- 'libvpx/vp8/common/dequantize.c', +- 'libvpx/vp8/common/entropy.c', +- 'libvpx/vp8/common/entropymode.c', +- 'libvpx/vp8/common/entropymv.c', +- 'libvpx/vp8/common/extend.c', +- 'libvpx/vp8/common/filter.c', +- 'libvpx/vp8/common/findnearmv.c', +- 'libvpx/vp8/common/generic/systemdependent.c', +- 'libvpx/vp8/common/idct_blk.c', +- 'libvpx/vp8/common/idctllm.c', +- 'libvpx/vp8/common/loopfilter_filters.c', +- 'libvpx/vp8/common/mbpitch.c', +- 'libvpx/vp8/common/modecont.c', +- 'libvpx/vp8/common/quant_common.c', +- 'libvpx/vp8/common/reconinter.c', +- 'libvpx/vp8/common/reconintra.c', +- 'libvpx/vp8/common/reconintra4x4.c', +- 'libvpx/vp8/common/rtcd.c', +- 'libvpx/vp8/common/setupintrarecon.c', +- 'libvpx/vp8/common/swapyv12buffer.c', +- 'libvpx/vp8/common/treecoder.c', +- 'libvpx/vp8/common/vp8_loopfilter.c', +- 'libvpx/vp8/common/vp8_skin_detection.c', +- 'libvpx/vp8/decoder/dboolhuff.c', +- 'libvpx/vp8/decoder/decodeframe.c', +- 'libvpx/vp8/decoder/decodemv.c', +- 'libvpx/vp8/decoder/detokenize.c', +- 'libvpx/vp8/decoder/onyxd_if.c', +- 'libvpx/vp8/decoder/threading.c', +- 'libvpx/vp8/encoder/arm/neon/denoising_neon.c', +- 'libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.c', +- 'libvpx/vp8/encoder/arm/neon/shortfdct_neon.c', +- 'libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c', +- 'libvpx/vp8/encoder/bitstream.c', +- 'libvpx/vp8/encoder/boolhuff.c', +- 'libvpx/vp8/encoder/copy_c.c', +- 'libvpx/vp8/encoder/dct.c', +- 'libvpx/vp8/encoder/denoising.c', +- 'libvpx/vp8/encoder/encodeframe.c', +- 'libvpx/vp8/encoder/encodeintra.c', +- 'libvpx/vp8/encoder/encodemb.c', +- 'libvpx/vp8/encoder/encodemv.c', +- 'libvpx/vp8/encoder/ethreading.c', +- 'libvpx/vp8/encoder/lookahead.c', +- 'libvpx/vp8/encoder/mcomp.c', +- 'libvpx/vp8/encoder/modecosts.c', +- 'libvpx/vp8/encoder/mr_dissim.c', +- 'libvpx/vp8/encoder/onyx_if.c', +- 'libvpx/vp8/encoder/pickinter.c', +- 'libvpx/vp8/encoder/picklpf.c', +- 'libvpx/vp8/encoder/ratectrl.c', +- 'libvpx/vp8/encoder/rdopt.c', +- 'libvpx/vp8/encoder/segmentation.c', +- 'libvpx/vp8/encoder/tokenize.c', +- 'libvpx/vp8/encoder/treewriter.c', +- 'libvpx/vp8/encoder/vp8_quantize.c', +- 'libvpx/vp8/vp8_cx_iface.c', +- 'libvpx/vp8/vp8_dx_iface.c', +- 'libvpx/vp9/common/arm/neon/vp9_iht16x16_add_neon.c', +- 'libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c', +- 'libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c', +- 'libvpx/vp9/common/vp9_alloccommon.c', +- 'libvpx/vp9/common/vp9_blockd.c', +- 'libvpx/vp9/common/vp9_common_data.c', +- 'libvpx/vp9/common/vp9_entropy.c', +- 'libvpx/vp9/common/vp9_entropymode.c', +- 'libvpx/vp9/common/vp9_entropymv.c', +- 'libvpx/vp9/common/vp9_filter.c', +- 'libvpx/vp9/common/vp9_frame_buffers.c', +- 'libvpx/vp9/common/vp9_idct.c', +- 'libvpx/vp9/common/vp9_loopfilter.c', +- 'libvpx/vp9/common/vp9_mvref_common.c', +- 'libvpx/vp9/common/vp9_pred_common.c', +- 'libvpx/vp9/common/vp9_quant_common.c', +- 'libvpx/vp9/common/vp9_reconinter.c', +- 'libvpx/vp9/common/vp9_reconintra.c', +- 'libvpx/vp9/common/vp9_rtcd.c', +- 'libvpx/vp9/common/vp9_scale.c', +- 'libvpx/vp9/common/vp9_scan.c', +- 'libvpx/vp9/common/vp9_seg_common.c', +- 'libvpx/vp9/common/vp9_thread_common.c', +- 'libvpx/vp9/common/vp9_tile_common.c', +- 'libvpx/vp9/decoder/vp9_decodeframe.c', +- 'libvpx/vp9/decoder/vp9_decodemv.c', +- 'libvpx/vp9/decoder/vp9_decoder.c', +- 'libvpx/vp9/decoder/vp9_detokenize.c', +- 'libvpx/vp9/decoder/vp9_dsubexp.c', +- 'libvpx/vp9/decoder/vp9_job_queue.c', +- 'libvpx/vp9/encoder/arm/neon/vp9_error_neon.c', +- 'libvpx/vp9/encoder/arm/neon/vp9_frame_scale_neon.c', +- 'libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c', +- 'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c', +- 'libvpx/vp9/encoder/vp9_bitstream.c', +- 'libvpx/vp9/encoder/vp9_context_tree.c', +- 'libvpx/vp9/encoder/vp9_cost.c', +- 'libvpx/vp9/encoder/vp9_dct.c', +- 'libvpx/vp9/encoder/vp9_encodeframe.c', +- 'libvpx/vp9/encoder/vp9_encodemb.c', +- 'libvpx/vp9/encoder/vp9_encodemv.c', +- 'libvpx/vp9/encoder/vp9_encoder.c', +- 'libvpx/vp9/encoder/vp9_ethread.c', +- 'libvpx/vp9/encoder/vp9_ext_ratectrl.c', +- 'libvpx/vp9/encoder/vp9_extend.c', +- 'libvpx/vp9/encoder/vp9_frame_scale.c', +- 'libvpx/vp9/encoder/vp9_lookahead.c', +- 'libvpx/vp9/encoder/vp9_mcomp.c', +- 'libvpx/vp9/encoder/vp9_multi_thread.c', +- 'libvpx/vp9/encoder/vp9_noise_estimate.c', +- 'libvpx/vp9/encoder/vp9_picklpf.c', +- 'libvpx/vp9/encoder/vp9_pickmode.c', +- 'libvpx/vp9/encoder/vp9_quantize.c', +- 'libvpx/vp9/encoder/vp9_ratectrl.c', +- 'libvpx/vp9/encoder/vp9_rd.c', +- 'libvpx/vp9/encoder/vp9_rdopt.c', +- 'libvpx/vp9/encoder/vp9_resize.c', +- 'libvpx/vp9/encoder/vp9_segmentation.c', +- 'libvpx/vp9/encoder/vp9_skin_detection.c', +- 'libvpx/vp9/encoder/vp9_speed_features.c', +- 'libvpx/vp9/encoder/vp9_subexp.c', +- 'libvpx/vp9/encoder/vp9_svc_layercontext.c', +- 'libvpx/vp9/encoder/vp9_tokenize.c', +- 'libvpx/vp9/encoder/vp9_treewriter.c', +- 'libvpx/vp9/vp9_cx_iface.c', +- 'libvpx/vp9/vp9_dx_iface.c', +- 'libvpx/vp9/vp9_iface_common.c', +- 'libvpx/vpx/src/vpx_codec.c', +- 'libvpx/vpx/src/vpx_decoder.c', +- 'libvpx/vpx/src/vpx_encoder.c', +- 'libvpx/vpx/src/vpx_image.c', +- 'libvpx/vpx_dsp/arm/avg_neon.c', +- 'libvpx/vpx_dsp/arm/avg_pred_neon.c', +- 'libvpx/vpx_dsp/arm/fdct16x16_neon.c', +- 'libvpx/vpx_dsp/arm/fdct32x32_neon.c', +- 'libvpx/vpx_dsp/arm/fdct_neon.c', +- 'libvpx/vpx_dsp/arm/fdct_partial_neon.c', +- 'libvpx/vpx_dsp/arm/fwd_txfm_neon.c', +- 'libvpx/vpx_dsp/arm/hadamard_neon.c', +- 'libvpx/vpx_dsp/arm/idct16x16_1_add_neon.c', +- 'libvpx/vpx_dsp/arm/idct16x16_add_neon.c', +- 'libvpx/vpx_dsp/arm/idct32x32_135_add_neon.c', +- 'libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c', +- 'libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c', +- 'libvpx/vpx_dsp/arm/idct32x32_add_neon.c', +- 'libvpx/vpx_dsp/arm/idct4x4_1_add_neon.asm', +- 'libvpx/vpx_dsp/arm/idct4x4_add_neon.asm', +- 'libvpx/vpx_dsp/arm/idct8x8_1_add_neon.c', +- 'libvpx/vpx_dsp/arm/idct8x8_add_neon.c', +- 'libvpx/vpx_dsp/arm/idct_neon.asm', +- 'libvpx/vpx_dsp/arm/intrapred_neon.c', +- 'libvpx/vpx_dsp/arm/intrapred_neon_asm.asm', +- 'libvpx/vpx_dsp/arm/loopfilter_16_neon.asm', +- 'libvpx/vpx_dsp/arm/loopfilter_4_neon.asm', +- 'libvpx/vpx_dsp/arm/loopfilter_8_neon.asm', +- 'libvpx/vpx_dsp/arm/quantize_neon.c', +- 'libvpx/vpx_dsp/arm/sad4d_neon.c', +- 'libvpx/vpx_dsp/arm/sad_neon.c', +- 'libvpx/vpx_dsp/arm/save_reg_neon.asm', +- 'libvpx/vpx_dsp/arm/subpel_variance_neon.c', +- 'libvpx/vpx_dsp/arm/subtract_neon.c', +- 'libvpx/vpx_dsp/arm/sum_squares_neon.c', +- 'libvpx/vpx_dsp/arm/variance_neon.c', +- 'libvpx/vpx_dsp/arm/vpx_convolve8_avg_horiz_filter_type1_neon.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve8_avg_horiz_filter_type2_neon.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type1_neon.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type2_neon.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve8_horiz_filter_type1_neon.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve8_horiz_filter_type2_neon.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve8_neon_asm.c', +- 'libvpx/vpx_dsp/arm/vpx_convolve8_vert_filter_type1_neon.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve8_vert_filter_type2_neon.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve_avg_neon_asm.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve_copy_neon_asm.asm', +- 'libvpx/vpx_dsp/arm/vpx_convolve_neon.c', +- 'libvpx/vpx_dsp/arm/vpx_scaled_convolve8_neon.c', +- 'libvpx/vpx_dsp/avg.c', +- 'libvpx/vpx_dsp/bitreader.c', +- 'libvpx/vpx_dsp/bitreader_buffer.c', +- 'libvpx/vpx_dsp/bitwriter.c', +- 'libvpx/vpx_dsp/bitwriter_buffer.c', +- 'libvpx/vpx_dsp/fwd_txfm.c', +- 'libvpx/vpx_dsp/intrapred.c', +- 'libvpx/vpx_dsp/inv_txfm.c', +- 'libvpx/vpx_dsp/loopfilter.c', +- 'libvpx/vpx_dsp/prob.c', +- 'libvpx/vpx_dsp/psnr.c', +- 'libvpx/vpx_dsp/quantize.c', +- 'libvpx/vpx_dsp/sad.c', +- 'libvpx/vpx_dsp/skin_detection.c', +- 'libvpx/vpx_dsp/subtract.c', +- 'libvpx/vpx_dsp/sum_squares.c', +- 'libvpx/vpx_dsp/variance.c', +- 'libvpx/vpx_dsp/vpx_convolve.c', +- 'libvpx/vpx_dsp/vpx_dsp_rtcd.c', +- 'libvpx/vpx_mem/vpx_mem.c', +- 'libvpx/vpx_ports/arm_cpudetect.c', +- 'libvpx/vpx_scale/generic/gen_scalers.c', +- 'libvpx/vpx_scale/generic/vpx_scale.c', +- 'libvpx/vpx_scale/generic/yv12config.c', +- 'libvpx/vpx_scale/generic/yv12extend.c', +- 'libvpx/vpx_scale/vpx_scale_rtcd.c', +- 'libvpx/vpx_util/vpx_thread.c', +- 'libvpx/vpx_util/vpx_write_yuv_frame.c', + ], + 'ARM64_EXPORTS': [ + 'libvpx/vpx/vp8.h', +diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h +index 8600329931e..be4791dd846 100644 +--- a/mozglue/build/arm.h ++++ b/mozglue/build/arm.h +@@ -59,13 +59,13 @@ + # define MOZILLA_MAY_SUPPORT_ARMV6 1 + # endif + +-# if defined(HAVE_ARM_NEON) +-# define MOZILLA_MAY_SUPPORT_NEON 1 +-# endif ++//# if defined(HAVE_ARM_NEON) ++//# define MOZILLA_MAY_SUPPORT_NEON 1 ++//# endif + +-# if defined(HAVE_ARM_SIMD) +-# define MOZILLA_MAY_SUPPORT_ARMV7 1 +-# endif ++//# if defined(HAVE_ARM_SIMD) ++//# define MOZILLA_MAY_SUPPORT_ARMV7 1 ++//# endif + # endif + + // Currently we only have CPU detection for Linux via /proc/cpuinfo +diff --git a/third_party/aom/aom_dsp/aom_dsp.cmake b/third_party/aom/aom_dsp/aom_dsp.cmake +index 11ff73756b7..b13500417ce 100644 +--- a/third_party/aom/aom_dsp/aom_dsp.cmake ++++ b/third_party/aom/aom_dsp/aom_dsp.cmake +@@ -96,12 +96,12 @@ list(APPEND AOM_DSP_COMMON_INTRIN_AVX2 + "${AOM_ROOT}/aom_dsp/x86/intrapred_avx2.c" + "${AOM_ROOT}/aom_dsp/x86/blend_a64_mask_avx2.c") + +-list(APPEND AOM_DSP_COMMON_INTRIN_NEON +- "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c" +- "${AOM_ROOT}/aom_dsp/arm/loopfilter_neon.c" +- "${AOM_ROOT}/aom_dsp/arm/intrapred_neon.c" +- "${AOM_ROOT}/aom_dsp/arm/subtract_neon.c" +- "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c") ++#list(APPEND AOM_DSP_COMMON_INTRIN_NEON ++# "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c" ++# "${AOM_ROOT}/aom_dsp/arm/loopfilter_neon.c" ++# "${AOM_ROOT}/aom_dsp/arm/intrapred_neon.c" ++# "${AOM_ROOT}/aom_dsp/arm/subtract_neon.c" ++# "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c") + + list(APPEND AOM_DSP_COMMON_INTRIN_DSPR2 + "${AOM_ROOT}/aom_dsp/mips/common_dspr2.c" diff -Nru firefox-esr-102.3.0esr/debian/patches/disable-neon-in-qcms.patch firefox-esr-102.3.0esr/debian/patches/disable-neon-in-qcms.patch --- firefox-esr-102.3.0esr/debian/patches/disable-neon-in-qcms.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/patches/disable-neon-in-qcms.patch 2022-09-26 05:42:10.000000000 +0000 @@ -0,0 +1,83 @@ +From: Peter Michael Green +Subject: Disable neon in qcms. + +--- thunderbird-102.1.1.orig/gfx/qcms/qcmsint.h ++++ thunderbird-102.1.1/gfx/qcms/qcmsint.h +@@ -96,18 +96,18 @@ void qcms_transform_data_bgra_out_lut_al + unsigned char *dest, + size_t length); + +-void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform, +- const unsigned char *src, +- unsigned char *dest, +- size_t length); +-void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform, +- const unsigned char *src, +- unsigned char *dest, +- size_t length); +-void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform, +- const unsigned char *src, +- unsigned char *dest, +- size_t length); ++//void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform, ++// const unsigned char *src, ++// unsigned char *dest, ++// size_t length); ++//void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform, ++// const unsigned char *src, ++// unsigned char *dest, ++// size_t length); ++//void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform, ++// const unsigned char *src, ++// unsigned char *dest, ++// size_t length); + + extern bool qcms_supports_iccv4; + extern bool qcms_supports_neon; +--- thunderbird-102.1.1.orig/gfx/qcms/src/lib.rs ++++ thunderbird-102.1.1/gfx/qcms/src/lib.rs +@@ -64,8 +64,8 @@ pub use transform::DataType; + pub use transform::Transform; + #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] + mod transform_avx; +-#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))] +-mod transform_neon; ++//#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))] ++//mod transform_neon; + #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] + mod transform_sse2; + mod transform_util; +--- thunderbird-102.1.1.orig/gfx/qcms/src/transform.rs ++++ thunderbird-102.1.1/gfx/qcms/src/transform.rs +@@ -21,11 +21,11 @@ + // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + #![allow(clippy::missing_safety_doc)] +-#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))] ++/*#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))] + use crate::transform_neon::{ + qcms_transform_data_bgra_out_lut_neon, qcms_transform_data_rgb_out_lut_neon, + qcms_transform_data_rgba_out_lut_neon, +-}; ++};*/ + use crate::{ + chain::chain_transform, + double_to_s15Fixed16Number, +@@ -1369,7 +1369,7 @@ pub fn transform_create( + } + } + +- #[cfg(all(target_arch = "arm", feature = "neon"))] ++ /*#[cfg(all(target_arch = "arm", feature = "neon"))] + let neon_supported = is_arm_feature_detected!("neon"); + #[cfg(all(target_arch = "aarch64", feature = "neon"))] + let neon_supported = is_aarch64_feature_detected!("neon"); +@@ -1383,7 +1383,7 @@ pub fn transform_create( + } else if in_type == BGRA8 { + transform.transform_fn = Some(qcms_transform_data_bgra_out_lut_neon) + } +- } ++ }*/ + + if transform.transform_fn.is_none() { + if in_type == RGB8 { diff -Nru firefox-esr-102.3.0esr/debian/patches/raspbian-rust-triplet-hack.patch firefox-esr-102.3.0esr/debian/patches/raspbian-rust-triplet-hack.patch --- firefox-esr-102.3.0esr/debian/patches/raspbian-rust-triplet-hack.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/patches/raspbian-rust-triplet-hack.patch 2022-09-26 05:42:10.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Hack broken rust target selection so it produces the right target on raspbian. +Author: Peter Michael Green +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index 40f017da67..07308cb6cd 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -236,9 +236,14 @@ def rust_compiler(rustc_info, cargo_info): + + + @depends(rustc, when=rust_compiler) ++@imports("sys") ++@imports(_from="__builtin__", _import='repr') + @imports(_from="__builtin__", _import="ValueError") + def rust_supported_targets(rustc): ++ #HACK: if there are multiple matches the algorithm uses the last one ++ #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered + out = check_cmd_output(rustc, "--print", "target-list").splitlines() ++ out.append("arm-unknown-linux-gnueabihf") + data = {} + for t in out: + try: diff -Nru firefox-esr-102.3.0esr/debian/patches/series firefox-esr-102.3.0esr/debian/patches/series --- firefox-esr-102.3.0esr/debian/patches/series 2022-09-20 21:57:17.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/patches/series 2022-09-26 05:42:10.000000000 +0000 @@ -22,3 +22,10 @@ debian-hacks/Allow-to-override-rust-LTO-flag.patch debian-hacks/Remove-workaround-for-old-libstdc-problem-which-now-.patch debian-hacks/Add-missing-webrtc-directory-for-ppc64el-bz-1775202.patch +raspbian-rust-triplet-hack.patch +try-to-disable-neon.patch +try-harder-to-disable-neon.patch +disable-neon-in-qcms.patch +use-a-define-instead-of-a-typedef-for-do.patch +disable-more-armv7neon-stuff.patch +disable-jit.patch diff -Nru firefox-esr-102.3.0esr/debian/patches/try-harder-to-disable-neon.patch firefox-esr-102.3.0esr/debian/patches/try-harder-to-disable-neon.patch --- firefox-esr-102.3.0esr/debian/patches/try-harder-to-disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/patches/try-harder-to-disable-neon.patch 2022-09-26 05:42:10.000000000 +0000 @@ -0,0 +1,21 @@ +From: Peter Michael Green +Date: Thu, 7 Nov 2019 11:23:19 +0000 +X-Dgit-Generated: 68.2.0esr-1+rpi1 a8a34a748cbe157a1fb6bfdb2c127ff6ec8416e9 +Subject: Try harder to disable neon. + + +--- + +--- firefox-esr-68.2.0esr.orig/build/moz.configure/arm.configure ++++ firefox-esr-68.2.0esr/build/moz.configure/arm.configure +@@ -229,8 +229,8 @@ def build_arm_neon(arm_arch): + return arm_arch >= 700 + + +-set_config("BUILD_ARM_NEON", build_arm_neon) +-set_define("BUILD_ARM_NEON", build_arm_neon) ++#set_config("BUILD_ARM_NEON", build_arm_neon) ++#set_define("BUILD_ARM_NEON", build_arm_neon) + + + set_config("ARM_ARCH", depends(arm_target.arm_arch)(lambda x: str(x))) diff -Nru firefox-esr-102.3.0esr/debian/patches/try-to-disable-neon.patch firefox-esr-102.3.0esr/debian/patches/try-to-disable-neon.patch --- firefox-esr-102.3.0esr/debian/patches/try-to-disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/patches/try-to-disable-neon.patch 2022-09-26 05:42:10.000000000 +0000 @@ -0,0 +1,15 @@ +From: Peter Michael Green +Date: Thu, 7 Nov 2019 08:48:48 +0000 +X-Dgit-Generated: 68.2.0esr-1+rpi1 be4da04b831a114d84fc719b35cbf9cd4014c464 +Subject: Try to disable neon. + + +--- + +--- firefox-esr-68.2.0esr.orig/build/moz.configure/arm.configure ++++ firefox-esr-68.2.0esr/build/moz.configure/arm.configure +@@ -228,3 +228,3 @@ + def build_arm_neon(arm_arch): +- return arm_arch >= 7 ++ return arm_arch >= 700 + diff -Nru firefox-esr-102.3.0esr/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch firefox-esr-102.3.0esr/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch --- firefox-esr-102.3.0esr/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch 2022-09-26 05:42:10.000000000 +0000 @@ -0,0 +1,19 @@ +From: Peter Michael Green +Date: Tue, 21 Dec 2021 17:35:22 +0000 +X-Dgit-Generated: 91.4.0esr-1+rpi1 f2f0506a7eb9cf10f4fe44779c3d669707eb61e3 +Subject: Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting definitions error. + + +--- + +--- firefox-esr-91.4.0esr.orig/modules/fdlibm/src/math_private.h ++++ firefox-esr-91.4.0esr/modules/fdlibm/src/math_private.h +@@ -35,7 +35,7 @@ typedef long double __double_t; + #else + typedef double __double_t; + #endif +-typedef __double_t double_t; ++#define double_t __double_t + + /* + * The original fdlibm code used statements like: diff -Nru firefox-esr-102.3.0esr/debian/rules firefox-esr-102.3.0esr/debian/rules --- firefox-esr-102.3.0esr/debian/rules 2022-09-20 21:57:17.000000000 +0000 +++ firefox-esr-102.3.0esr/debian/rules 2022-09-26 05:42:10.000000000 +0000 @@ -1,4 +1,6 @@ #!/usr/bin/make -f +export HOME=$(CURDIR)/fakehome + TESTDIR = $(shell dh_testdir || echo no) ifeq (,$(TESTDIR)) include debian/make.mk @@ -135,7 +137,7 @@ ifneq (,$(filter i386 amd64 armel armhf arm64,$(DEB_HOST_ARCH))) CRASH_REPORTER = 1 endif -ifneq (,$(filter mips%,$(DEB_HOST_ARCH))) +ifneq (,$(filter armhf mips%,$(DEB_HOST_ARCH))) CONFIGURE_FLAGS += --disable-webrtc endif @@ -146,9 +148,9 @@ CXX := g++ endif -ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH))) +#ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH))) CONFIGURE_FLAGS += --disable-jit -endif +#endif CXXFLAGS = $(CFLAGS) RUSTFLAGS = --remap-path-prefix=$(CURDIR)=. @@ -196,6 +198,7 @@ endif override_dh_auto_configure: + mkdir -p fakehome configure js/src/configure: cp -f $@.in $@ && chmod +x $@ @@ -290,12 +293,16 @@ rm -f $(filter-out debian/control debian/watch,$(GENERATED_FILES)) rm -f $$(cat debian/extra-clean 2>/dev/null) debian/extra-clean old-configure js/src/old-configure rm -rf stamps l10n $(CARGO_HOME) + rm -f third_party/python/psutil/psutil/*.so + rm -rf third_party/python/psutil/build/temp* + rm -rf third_party/python/psutil/build/lib* debian/rules debian/control TESTDIR= dh_auto_clean --builddirectory=build-$(PRODUCT) dh_auto_clean --builddirectory=build-l10n find . -name "*.pyc" -o -name "*.pyo" | xargs --no-run-if-empty rm -f rm -rf debian/objdir $(MOZBUILD_STATE_PATH) + find . -name __pycache__ -delete override_dh_clean: dh_clean -XCargo.toml.orig @@ -304,6 +311,8 @@ sed -i '2!b;/^exec "/ d' $$dir/$$file; \ done; \ done + rm -rf build-browser + rm -rf fakehome override_dh_auto_install-arch: stamps/install-$(PRODUCT) override_dh_auto_install-indep: @@ -358,3 +367,4 @@ @mkdir -p stamps $(if $(wildcard $@),,touch $@) endif +