projects / thunderbird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 21dcee8)
Don't try to build gcm-arm32-neon.c archive/raspbian/1%91.4.1-1_deb11u1+rpi1 raspbian/1%91.4.1-1_deb11u1+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Fri, 14 Jan 2022 01:06:03 +0000 (01:06 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Sun, 16 Jan 2022 03:48:21 +0000 (03:48 +0000)
debian/changelog patch | blob | history
debian/patches/patch-out-neon-in-freebl.patch patch | blob | history
security/nss/lib/freebl/Makefile patch | blob | history
security/nss/lib/freebl/freebl.gyp patch | blob | history
third_party/rust/nss_build_common/.cargo-checksum.json patch | blob | history
third_party/rust/nss_build_common/src/lib.rs patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 8f1331a3a36c1cc05050e45a10f0b9d6a747ed5d..68de065abf3f6732d63304168f3af4d2844b8ea9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,7 +33,7 @@ thunderbird (1:91.4.1-1~deb11u1+rpi1) bullseye-staging; urgency=medium
   * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting
     definitions error.
 
- -- Raspbian forward porter <root@raspbian.org>  Thu, 13 Jan 2022 18:38:02 +0000
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 14 Jan 2022 01:03:38 +0000
 
 thunderbird (1:91.4.1-1~deb11u1) bullseye-security; urgency=medium
 
diff --git a/debian/patches/patch-out-neon-in-freebl.patch b/debian/patches/patch-out-neon-in-freebl.patch
index 344c13719a6e7b41b169f6f10e94e9ba8a1eb990..fb7796ee517df0b3ae38cf719740c8b3df904fd2 100644 (file)
--- a/debian/patches/patch-out-neon-in-freebl.patch
+++ b/debian/patches/patch-out-neon-in-freebl.patch
@@ -7,7 +7,7 @@ Subject: Patch out neon in freebl
 ---
 
 diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
-index 0b8c6f42fa..cc2d8ca694 100644
+index 0b8c6f42fa4..0e60a0631ab 100644
 --- a/security/nss/lib/freebl/Makefile
 +++ b/security/nss/lib/freebl/Makefile
 @@ -153,9 +153,9 @@ ifeq ($(CPU_ARCH),aarch64)
@@ -23,6 +23,19 @@ index 0b8c6f42fa..cc2d8ca694 100644
      ifdef CC_IS_CLANG
          DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
          EXTRA_SRCS += aes-armv8.c sha1-armv8.c sha256-armv8.c
+@@ -774,9 +774,9 @@ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep _
+ $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ $(OBJDIR)/$(PROG_PREFIX)sha1-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ $(OBJDIR)/$(PROG_PREFIX)sha256-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+-ifndef NSS_DISABLE_ARM32_NEON
+-$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+-endif
++#ifndef NSS_DISABLE_ARM32_NEON
++#$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
++#endif
+ endif
+ 
+ ifeq ($(CPU_ARCH),aarch64)
 diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp
 index e7703baf8d..bf30643dbf 100644
 --- a/security/nss/lib/freebl/freebl.gyp
@@ -124,3 +137,112 @@ index 82b1f419d9..e255787646 100644
  
  #ifdef __powerpc64__
  #include "ppc-crypto.h"
+--- thunderbird-91.4.1.orig/security/nss/lib/freebl/freebl.gyp
++++ thunderbird-91.4.1/security/nss/lib/freebl/freebl.gyp
+@@ -251,25 +251,25 @@
+         }]
+       ]
+     },
+-    {
+-      'target_name': 'gcm-aes-arm32-neon_c_lib',
+-      'type': 'static_library',
+-      'sources': [
+-        'gcm-arm32-neon.c'
+-      ],
+-      'dependencies': [
+-        '<(DEPTH)/exports.gyp:nss_exports'
+-      ],
+-      #'cflags': [
+-      #  '-march=armv7',
+-      #  '-mfpu=neon',
+-      #  '<@(softfp_cflags)',
+-      #],
+-      #'cflags_mozilla': [
+-      #  '-mfpu=neon',
+-      #  '<@(softfp_cflags)',
+-      #]
+-    },
++    #{
++    #  'target_name': 'gcm-aes-arm32-neon_c_lib',
++    #  'type': 'static_library',
++    #  'sources': [
++    #    'gcm-arm32-neon.c'
++    #  ],
++    #  'dependencies': [
++    #    '<(DEPTH)/exports.gyp:nss_exports'
++    #  ],
++    #  #'cflags': [
++    #  #  '-march=armv7',
++    #  #  '-mfpu=neon',
++    #  #  '<@(softfp_cflags)',
++    #  #],
++    #  #'cflags_mozilla': [
++    #  #  '-mfpu=neon',
++    #  #  '<@(softfp_cflags)',
++    #  #]
++    #},
+     {
+       'target_name': 'gcm-aes-aarch64_c_lib',
+       'type': 'static_library',
+@@ -525,12 +525,12 @@
+             'sha-x86_c_lib',
+           ],
+         }],
+-        [ 'disable_arm32_neon==0 and target_arch=="arm"', {
+-          'dependencies': [
+-            'gcm-aes-arm32-neon_c_lib',
+-          ],
+-        }],
+-        [ 'disable_arm32_neon==1 and target_arch=="arm"', {
++        #[ 'disable_arm32_neon==0 and target_arch=="arm"', {
++        #  'dependencies': [
++        #    'gcm-aes-arm32-neon_c_lib',
++        #  ],
++        #}],
++        [ 'target_arch=="arm"', {
+           'defines!': [
+             'NSS_DISABLE_ARM32_NEON',
+           ],
+@@ -612,12 +612,12 @@
+             'sha-x86_c_lib',
+           ],
+         }],
+-        [ 'disable_arm32_neon==0 and target_arch=="arm"', {
+-          'dependencies': [
+-            'gcm-aes-arm32-neon_c_lib',
+-          ],
+-        }],
+-        [ 'disable_arm32_neon==1 and target_arch=="arm"', {
++        #[ 'disable_arm32_neon==0 and target_arch=="arm"', {
++        #  'dependencies': [
++        #    'gcm-aes-arm32-neon_c_lib',
++        #  ],
++        #}],
++        [ 'target_arch=="arm"', {
+           'defines!': [
+             'NSS_DISABLE_ARM32_NEON',
+           ],
+--- thunderbird-91.4.1.orig/third_party/rust/nss_build_common/src/lib.rs
++++ thunderbird-91.4.1/third_party/rust/nss_build_common/src/lib.rs
+@@ -109,9 +109,9 @@ fn get_nss_libs(kind: LinkingKind) -> Ve
+             if target_arch == "x86_64" || target_arch == "x86" {
+                 static_libs.push("gcm-aes-x86_c_lib");
+             }
+-            if target_arch == "arm" {
+-                static_libs.push("gcm-aes-arm32-neon_c_lib")
+-            }
++            //if target_arch == "arm" {
++            //    static_libs.push("gcm-aes-arm32-neon_c_lib")
++            //}
+             if target_arch == "aarch64" {
+                 static_libs.push("gcm-aes-aarch64_c_lib");
+             }
+diff --git a/third_party/rust/nss_build_common/.cargo-checksum.json b/third_party/rust/nss_build_common/.cargo-checksum.json
+index c29a0010987..11e5f160379 100644
+--- a/third_party/rust/nss_build_common/.cargo-checksum.json
++++ b/third_party/rust/nss_build_common/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"a9077862fc7c45044178fa2675a04d0b31a27574d93a328e03df3108342dd6e4"},"package":null}
+\ No newline at end of file
++{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"e66390f87683fccc863a5c847000efbe86ac27161f5e3574ba354302267f288c"},"package":null}
+\ No newline at end of file
diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
index cc2d8ca694bfb64f6b153176fddab41bae3476dd..0e60a0631ab55329afa3e717df95bd1b3f2138c1 100644 (file)
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -774,9 +774,9 @@ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep _
 $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
 $(OBJDIR)/$(PROG_PREFIX)sha1-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
 $(OBJDIR)/$(PROG_PREFIX)sha256-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
-ifndef NSS_DISABLE_ARM32_NEON
-$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
-endif
+#ifndef NSS_DISABLE_ARM32_NEON
+#$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+#endif
 endif
 
 ifeq ($(CPU_ARCH),aarch64)
diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp
index bf30643dbf9421bab444cf2a3f10426cc68d902e..6bf34c725839c78df22a45cf1ecda1f6a9a27be6 100644 (file)
--- a/security/nss/lib/freebl/freebl.gyp
+++ b/security/nss/lib/freebl/freebl.gyp
@@ -251,25 +251,25 @@
         }]
       ]
     },
-    {
-      'target_name': 'gcm-aes-arm32-neon_c_lib',
-      'type': 'static_library',
-      'sources': [
-        'gcm-arm32-neon.c'
-      ],
-      'dependencies': [
-        '<(DEPTH)/exports.gyp:nss_exports'
-      ],
-      #'cflags': [
-      #  '-march=armv7',
-      #  '-mfpu=neon',
-      #  '<@(softfp_cflags)',
-      #],
-      #'cflags_mozilla': [
-      #  '-mfpu=neon',
-      #  '<@(softfp_cflags)',
-      #]
-    },
+    #{
+    #  'target_name': 'gcm-aes-arm32-neon_c_lib',
+    #  'type': 'static_library',
+    #  'sources': [
+    #    'gcm-arm32-neon.c'
+    #  ],
+    #  'dependencies': [
+    #    '<(DEPTH)/exports.gyp:nss_exports'
+    #  ],
+    #  #'cflags': [
+    #  #  '-march=armv7',
+    #  #  '-mfpu=neon',
+    #  #  '<@(softfp_cflags)',
+    #  #],
+    #  #'cflags_mozilla': [
+    #  #  '-mfpu=neon',
+    #  #  '<@(softfp_cflags)',
+    #  #]
+    #},
     {
       'target_name': 'gcm-aes-aarch64_c_lib',
       'type': 'static_library',
@@ -525,12 +525,12 @@
             'sha-x86_c_lib',
           ],
         }],
-        [ 'disable_arm32_neon==0 and target_arch=="arm"', {
-          'dependencies': [
-            'gcm-aes-arm32-neon_c_lib',
-          ],
-        }],
-        [ 'disable_arm32_neon==1 and target_arch=="arm"', {
+        #[ 'disable_arm32_neon==0 and target_arch=="arm"', {
+        #  'dependencies': [
+        #    'gcm-aes-arm32-neon_c_lib',
+        #  ],
+        #}],
+        [ 'target_arch=="arm"', {
           'defines!': [
             'NSS_DISABLE_ARM32_NEON',
           ],
@@ -612,12 +612,12 @@
             'sha-x86_c_lib',
           ],
         }],
-        [ 'disable_arm32_neon==0 and target_arch=="arm"', {
-          'dependencies': [
-            'gcm-aes-arm32-neon_c_lib',
-          ],
-        }],
-        [ 'disable_arm32_neon==1 and target_arch=="arm"', {
+        #[ 'disable_arm32_neon==0 and target_arch=="arm"', {
+        #  'dependencies': [
+        #    'gcm-aes-arm32-neon_c_lib',
+        #  ],
+        #}],
+        [ 'target_arch=="arm"', {
           'defines!': [
             'NSS_DISABLE_ARM32_NEON',
           ],
diff --git a/third_party/rust/nss_build_common/.cargo-checksum.json b/third_party/rust/nss_build_common/.cargo-checksum.json
index c29a0010987b4ce7df7766479da99de529e69e5f..11e5f1603796d75c1172961bb954abe37b8b7039 100644 (file)
--- a/third_party/rust/nss_build_common/.cargo-checksum.json
+++ b/third_party/rust/nss_build_common/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"a9077862fc7c45044178fa2675a04d0b31a27574d93a328e03df3108342dd6e4"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"e66390f87683fccc863a5c847000efbe86ac27161f5e3574ba354302267f288c"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/nss_build_common/src/lib.rs b/third_party/rust/nss_build_common/src/lib.rs
index 647b01770489b69386b5d5e2e6d7db6ca7caf931..693cdd9720cc3c0219b421c7b38057efec8c9e10 100644 (file)
--- a/third_party/rust/nss_build_common/src/lib.rs
+++ b/third_party/rust/nss_build_common/src/lib.rs
@@ -109,9 +109,9 @@ fn get_nss_libs(kind: LinkingKind) -> Vec<&'static str> {
             if target_arch == "x86_64" || target_arch == "x86" {
                 static_libs.push("gcm-aes-x86_c_lib");
             }
-            if target_arch == "arm" {
-                static_libs.push("gcm-aes-arm32-neon_c_lib")
-            }
+            //if target_arch == "arm" {
+            //    static_libs.push("gcm-aes-arm32-neon_c_lib")
+            //}
             if target_arch == "aarch64" {
                 static_libs.push("gcm-aes-aarch64_c_lib");
             }
Unnamed repository; edit this file 'description' to name the repository.