contrib/openssl-1.0.0f-configure.patch

   1 diff -u openssl-1.0.0f.orig/config openssl-1.0.0f//config
   2 --- openssl-1.0.0f.orig/config  2011-07-15 21:59:18.000000000 +0200
   3 +++ openssl-1.0.0f//config      2012-01-05 01:32:27.619235053 +0100
   4 @@ -825,9 +825,9 @@
   5  #  options="$options -DATALLA"
   6  #fi
   7
   8 -($CC -Wa,--help -c -o /dev/null -x assembler /dev/null 2>&1 | \
   9 - grep \\--noexecstack) 2>&1 > /dev/null && \
  10 -  options="$options -Wa,--noexecstack"
  11 +#($CC -Wa,--help -c -o /dev/null -x assembler /dev/null 2>&1 | \
  12 +# grep \\--noexecstack) 2>&1 > /dev/null && \
  13 +#  options="$options -Wa,--noexecstack"
  14
  15  # gcc < 2.8 does not support -march=ultrasparc
  16  if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
  17 diff -u openssl-1.0.0f.orig/Configure openssl-1.0.0f//Configure
  18 --- openssl-1.0.0f.orig/Configure       2011-12-19 18:04:38.000000000 +0100
  19 +++ openssl-1.0.0f//Configure   2012-01-05 01:21:18.723239740 +0100
  20 @@ -505,7 +505,7 @@
  21  "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",
  22
  23  # MinGW
  24 -"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",
  25 +"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",
  26  # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
  27  # compiled with one compiler with application compiled with another
  28  # compiler. It's possible to engage Applink support in mingw64 build,
  29 @@ -513,7 +513,7 @@
  30  # handling, one can't seriously consider its binaries for using with
  31  # non-mingw64 run-time environment. And as mingw64 is always consistent
  32  # with itself, Applink is never engaged and can as well be omitted.
  33 -"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",
  34 +"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",
  35
  36  # UWIN
  37  "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
  38 @@ -869,7 +869,7 @@
  39                         }
  40                 else
  41                         {
  42 -                       die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
  43 +                       #die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
  44                         $target=$_;
  45                         }
  46