[Libreoffice-commits] core.git: Branch 'aoo/trunk' - nss/nss_linux.patch

[Herbert Dürr]

 nss/nss_linux.patch |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit dd7d71f0b2f2056017e32f58b3b8c3d5ea993344
Author: Herbert Dürr <hdu at apache.org>
Date:   Fri Jan 10 13:15:50 2014 +0000

    #i123637# fix the NSS build on AOO's current Linux baseline
    
    where binutils assembler doesn't support AVX or AES-NI instructions

diff --git a/nss/nss_linux.patch b/nss/nss_linux.patch
index 80dd2294c..ee601bb1 100644
--- a/nss/nss_linux.patch
+++ b/nss/nss_linux.patch
@@ -9,3 +9,16 @@
  OS_LIBS			= $(OS_PTHREAD) -ldl -lc
  
  ifdef USE_PTHREADS
+--- misc/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile	2013-01-31 02:08:59.000000000 +0100
++++ misc/build/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile	2014-01-10 13:57:48.000000000 +0100
+@@ -186,8 +186,8 @@
+     DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+ #   DEFINES += -DMPI_AMD64_ADD
+     # comment the next two lines to turn off intel HW accelleration
+-    DEFINES += -DUSE_HW_AES
+-    ASFILES += intel-aes.s intel-gcm.s
++#    DEFINES += -DUSE_HW_AES
++#    ASFILES += intel-aes.s intel-gcm.s
+     EXTRA_SRCS += intel-gcm-wrap.c
+     INTEL_GCM = 1
+     MPI_SRCS += mpi_amd64.c mp_comba.c