Browse Source

fix windows moaconfig strip ootions

Bill Gianopoulos 10 months ago
parent
commit
baace87950

+ 51 - 0
mozilla-release/patches/TOP-PLASTER-fix-strip.patch

@@ -0,0 +1,51 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1702217928 0
+Avoid package faiures on Windows with some strip otion combinations.
+
+diff --git a/js/src/old-configure.in b/js/src/old-configure.in
+--- a/js/src/old-configure.in
++++ b/js/src/old-configure.in
+@@ -570,17 +570,18 @@ case "$target" in
+ 
+         WIN32_CONSOLE_EXE_LDFLAGS=-mconsole
+         WIN32_GUI_EXE_LDFLAGS=-mwindows
+     else
+         TARGET_COMPILER_ABI=msvc
+         HOST_CC='$(CC)'
+         HOST_CXX='$(CXX)'
+         RANLIB='echo not_ranlib'
+-        STRIP='echo not_strip'
++        STRIP='echo'
++        STRIP_FLAGS='not_strip'
+         PKG_SKIP_STRIP=1
+         # aarch64 doesn't support subsystems below 6.02
+         if test "$CPU_ARCH" = "aarch64"; then
+             WIN32_SUBSYSTEM_VERSION=6.02
+         else
+             WIN32_SUBSYSTEM_VERSION=6.01
+         fi
+         WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION
+diff --git a/old-configure.in b/old-configure.in
+--- a/old-configure.in
++++ b/old-configure.in
+@@ -673,17 +673,18 @@ case "$target" in
+             MOZ_FOLD_LIBS_FLAGS="-mnop-fun-dllimport"
+         else
+             # Silence problematic clang warnings
+             CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct"
+         fi
+     else
+         TARGET_COMPILER_ABI=msvc
+         RANLIB='echo not_ranlib'
+-        STRIP='echo not_strip'
++        STRIP='echo'
++        STRIP_FLAGS='not_strip'
+         PKG_SKIP_STRIP=1
+         # aarch64 doesn't support subsystems below 6.02
+         if test "$CPU_ARCH" = "aarch64"; then
+             WIN32_SUBSYSTEM_VERSION=6.02
+         else
+             WIN32_SUBSYSTEM_VERSION=6.01
+         fi
+         WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION

+ 1 - 0
mozilla-release/patches/series

@@ -5093,6 +5093,7 @@ TOP-NOBUG-revendor-25318.patch
 TOP-NOBUG-backout1440761-25318.patch
 TOP-NOBUG-test-fixes-25318.patch
 TOP-1846703-binutilsfix-11504.patch
+TOP-PLASTER-fix-strip.patch
 1837261-2-version-beta-mr-25318.patch
 1861842-version-release-mr-25318.patch
 1861843-1-version-prebeta-mr-25319.patch