contrib/openssl-1.0.1h-configure.patch

   1 diff -Nur openssl-1.0.1h.orig/config openssl-1.0.1h/config
   2 --- openssl-1.0.1h.orig/config  2014-06-05 11:44:33.000000000 +0200
   3 +++ openssl-1.0.1h/config       2014-06-29 03:58:01.297328864 +0200
   4 @@ -857,11 +857,11 @@
   5  #  options="$options -DATALLA"
   6  #fi
   7
   8 -if expr "$options" : '.*no\-asm' > /dev/null; then :; else
   9 -  sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \
  10 -  grep \\--noexecstack >/dev/null && \
  11 -  options="$options -Wa,--noexecstack"
  12 -fi
  13 +#if expr "$options" : '.*no\-asm' > /dev/null; then :; else
  14 +#  sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \
  15 +#  grep \\--noexecstack >/dev/null && \
  16 +#  options="$options -Wa,--noexecstack"
  17 +#fi
  18
  19  # gcc < 2.8 does not support -march=ultrasparc
  20  if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
  21 diff -Nur openssl-1.0.1h.orig/Configure openssl-1.0.1h/Configure
  22 --- openssl-1.0.1h.orig/Configure       2014-06-05 11:44:33.000000000 +0200
  23 +++ openssl-1.0.1h/Configure    2014-06-29 03:58:01.297328864 +0200
  24 @@ -533,7 +533,7 @@
  25  "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",
  26
  27  # MinGW
  28 -"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",
  29 +"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin -Wl,--export-all -shared:.dll.a",
  30  # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
  31  # compiled with one compiler with application compiled with another
  32  # compiler. It's possible to engage Applink support in mingw64 build,
  33 @@ -541,7 +541,7 @@
  34  # handling, one can't seriously consider its binaries for using with
  35  # non-mingw64 run-time environment. And as mingw64 is always consistent
  36  # with itself, Applink is never engaged and can as well be omitted.
  37 -"mingw64", "gcc:-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE::-D_MT:MINGW64:-lws2_32 -lgdi32 -lcrypt32:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:${x86_64_asm}:mingw64:win32:cygwin-shared:-D_WINDLL:-mno-cygwin:.dll.a",
  38 +"mingw64", "gcc:-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE::-D_MT:MINGW64:-lws2_32 -lgdi32 -lcrypt32:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:${x86_64_asm}:mingw64:win32:cygwin-shared:-D_WINDLL:-mno-cygwin -Wl,--export-all -shared:.dll.a",
  39
  40  # UWIN
  41  "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
  42 @@ -933,7 +933,7 @@
  43                         }
  44                 else
  45                         {
  46 -                       die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
  47 +                       #die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
  48                         $target=$_;
  49                         }
  50