From 48cf7859c12e95a25b6afa66c8deb112d8514cd0 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Fri, 7 Feb 2025 15:40:59 +0800 Subject: [PATCH 1/2] fix loongarch64 link failed --- 0001-fix-loongarch64-link-failed.patch | 45 ++++++++++++++++++++++++++ firefox.spec | 7 +++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 0001-fix-loongarch64-link-failed.patch diff --git a/0001-fix-loongarch64-link-failed.patch b/0001-fix-loongarch64-link-failed.patch new file mode 100644 index 0000000..5da6cea --- /dev/null +++ b/0001-fix-loongarch64-link-failed.patch @@ -0,0 +1,45 @@ +From 32f0b96d2e9ffcd0d5c041fdc4f46957acf28d3b Mon Sep 17 00:00:00 2001 +From: Your Name +Date: Fri, 7 Feb 2025 00:38:18 +0000 +Subject: [PATCH] fix loongarch64 link failed + +author Goloman Adrian +Thu, 06 Feb 2025 14:50:21 +0200 (11 hours ago) +changeset 772691 5223a9e8f62812d59d3daaedadb64d1be3c8757b +parent 769338 dc8e8233c9e7bdcffaceb77daba71d994e65c68d +permissions -rw-r--r-- +--- + media/libyuv/libyuv/libyuv.gyp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/media/libyuv/libyuv/libyuv.gyp b/media/libyuv/libyuv/libyuv.gyp +index 45df0d2e26..dd6c9ba46e 100644 +--- a/media/libyuv/libyuv/libyuv.gyp ++++ b/media/libyuv/libyuv/libyuv.gyp +@@ -29,6 +29,7 @@ + 'mips_msa%': 0, # Default to msa off. + 'build_neon': 0, + 'build_msa': 0, ++ 'build_lsx': 0, + 'conditions': [ + ['(target_arch == "armv7" or target_arch == "armv7s" or \ + (target_arch == "arm" and arm_version >= 7) or target_arch == "arm64")\ +@@ -100,6 +101,15 @@ + 'LIBYUV_MSA', + ], + }], ++ ['build_lsx == 0', { ++ 'conditions': [ ++ ['target_arch == "loongarch64"', { ++ 'cflags_mozilla': [ ++ '-mno-lsx', ++ ], ++ }], ++ ], ++ }], + ['build_with_mozilla == 1', { + 'defines': [ + 'HAVE_JPEG' +-- +2.41.0 + diff --git a/firefox.spec b/firefox.spec index 86d2821..c7b9dcb 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %define homepage %(grep '^HOME_URL\s*=' /etc/os-release | sed 's/^HOME_URL\s*=//;s/^\s*"//;s/"\s*$//') # Produce debug (non-optimized) package build. Suitable for debugging only @@ -130,6 +130,7 @@ Patch152: rhbz-1173156.patch Patch154: firefox-nss-addon-hack.patch # ARM run-time patch Patch155: rhbz-1354671.patch +Patch156: 0001-fix-loongarch64-link-failed.patch # BUILD REQURES/REQUIRES @@ -986,6 +987,7 @@ echo "--------------------------------------------" %patch -P155 -p1 -b .rhbz-1354671 %endif +%patch -P156 -p1 # ---- Security patches ---- %{__rm} -f .mozconfig @@ -1571,6 +1573,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Feb 7 2025 Wenlong Zhang - 128.3.1-2 +- fix loongarch64 link failed + * Fri Nov 08 2024 Kaiqiang Wang - 128.3.1-1 - update to 128.3.1esr -- Gitee From b31750193a264ce90f7e3a711365f0e41ab982a9 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Fri, 7 Feb 2025 15:56:11 +0800 Subject: [PATCH 2/2] fix libpng skia build failed for loongarch64 --- ...build-failed-for-loongarch64.-r-lsal.patch | 54 +++++++++++++++++++ firefox.spec | 7 ++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-libpng-skia-build-failed-for-loongarch64.-r-lsal.patch diff --git a/0001-Fix-libpng-skia-build-failed-for-loongarch64.-r-lsal.patch b/0001-Fix-libpng-skia-build-failed-for-loongarch64.-r-lsal.patch new file mode 100644 index 0000000..6fa5bb5 --- /dev/null +++ b/0001-Fix-libpng-skia-build-failed-for-loongarch64.-r-lsal.patch @@ -0,0 +1,54 @@ +From 9017f6def7f71cb9f8f28a5e22335d1fabb030db Mon Sep 17 00:00:00 2001 +From: Your Name +Date: Fri, 7 Feb 2025 09:39:03 +0000 +Subject: [PATCH] Fix libpng skia build failed for loongarch64. r=lsalzman + +--- + gfx/skia/generate_mozbuild.py | 2 ++ + gfx/skia/moz.build | 2 ++ + media/libpng/moz.build | 3 +++ + 3 files changed, 7 insertions(+) + +diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py +index b589efde1c..bbd7bfce4e 100755 +--- a/gfx/skia/generate_mozbuild.py ++++ b/gfx/skia/generate_mozbuild.py +@@ -28,6 +28,8 @@ if CONFIG['MOZ_OPTIMIZE']: + skia_opt_flags += ['-O2'] + elif CONFIG['CC_TYPE'] in ('clang', 'gcc'): + skia_opt_flags += ['-O3'] ++if CONFIG['TARGET_CPU'] in ('loongarch64'): ++ skia_opt_flags += ['-mno-lsx'] + + """ + +diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build +index 7fee545348..31d53aa25e 100644 +--- a/gfx/skia/moz.build ++++ b/gfx/skia/moz.build +@@ -21,6 +21,8 @@ if CONFIG['MOZ_OPTIMIZE']: + skia_opt_flags += ['-O2'] + elif CONFIG['CC_TYPE'] in ('clang', 'gcc'): + skia_opt_flags += ['-O3'] ++if CONFIG['TARGET_CPU'] in ('loongarch64'): ++ skia_opt_flags += ['-mno-lsx'] + + UNIFIED_SOURCES += [ + 'skia/src/base/SkArenaAlloc.cpp', +diff --git a/media/libpng/moz.build b/media/libpng/moz.build +index 663eb929fe..6fa28a814a 100644 +--- a/media/libpng/moz.build ++++ b/media/libpng/moz.build +@@ -65,6 +65,9 @@ if CONFIG['HAVE_ALTIVEC']: + 'powerpc/powerpc_init.c' + ] + ++if CONFIG['TARGET_CPU'] == 'loongarch64': ++ CFLAGS += ['-mno-lsx'] ++ + if CONFIG['MOZ_TREE_FREETYPE']: + DEFINES['FT_CONFIG_OPTION_USE_PNG'] = True + +-- +2.41.0 + diff --git a/firefox.spec b/firefox.spec index c7b9dcb..458edbe 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %define homepage %(grep '^HOME_URL\s*=' /etc/os-release | sed 's/^HOME_URL\s*=//;s/^\s*"//;s/"\s*$//') # Produce debug (non-optimized) package build. Suitable for debugging only @@ -131,6 +131,7 @@ Patch154: firefox-nss-addon-hack.patch # ARM run-time patch Patch155: rhbz-1354671.patch Patch156: 0001-fix-loongarch64-link-failed.patch +Patch157: 0001-Fix-libpng-skia-build-failed-for-loongarch64.-r-lsal.patch # BUILD REQURES/REQUIRES @@ -988,6 +989,7 @@ echo "--------------------------------------------" %endif %patch -P156 -p1 +%patch -P157 -p1 # ---- Security patches ---- %{__rm} -f .mozconfig @@ -1573,6 +1575,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Feb 7 2025 Wenlong Zhang - 128.3.1-3 +- fix libpng skia build failed for loongarch64 + * Fri Feb 7 2025 Wenlong Zhang - 128.3.1-2 - fix loongarch64 link failed -- Gitee