external/libxmlsec/xmlsec1-mingw32.patch

   1 --- misc/xmlsec1-1.2.14/configure.in    2009-09-29 15:55:33.282288142 +0200
   2 +++ misc/build/xmlsec1-1.2.14/configure.in      2009-09-29 15:49:39.614223428 +0200
   3 @@ -33,6 +33,8 @@
   4  AC_HEADER_STDC
   5
   6  LT_INIT
   7 +dnl force the right implib extension for mingw
   8 +libext=dll.a
   9
  10  dnl
  11  dnl Find programs
  12 @@ -672,6 +674,26 @@
  13         done
  14
  15         for dir in $ac_nss_lib_dir ; do
  16 +            case $host_os in
  17 +            cygwin* | mingw* | pw32*)
  18 +             if test -f $dir/libnspr4.$libext ; then
  19 +               dnl do not add -L/usr/lib because compiler does it anyway
  20 +               if test "z$dir" = "z/usr/lib" ; then
  21 +                   NSPR_LIBS="$NSPR_LIBS_LIST"
  22 +               else
  23 +                   if test "z$with_gnu_ld" = "zyes" ; then
  24 +                       NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST"
  25 +                   else
  26 +                       NSPR_LIBS="-L$dir $NSPR_LIBS_LIST"
  27 +                   fi
  28 +               fi
  29 +               NSPR_LIBS_FOUND="yes"
  30 +               break
  31 +           fi
  32 +              ;;
  33 +
  34 +            *)
  35 +
  36             if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
  37                 dnl do not add -L/usr/lib because compiler does it anyway
  38                 if test "z$dir" = "z/usr/lib" ; then
  39 @@ -686,6 +708,8 @@
  40                 NSPR_LIBS_FOUND="yes"
  41                 break
  42             fi
  43 +              ;;
  44 +            esac
  45         done
  46      fi
  47
  48 @@ -743,6 +767,25 @@
  49          done
  50
  51          for dir in $ac_nss_lib_dir ; do
  52 +            case $host_os in
  53 +            cygwin* | mingw* | pw32*)
  54 +             if test -f $dir/libnss3.$libext ; then
  55 +               dnl do not add -L/usr/lib because compiler does it anyway
  56 +               if test "z$dir" = "z/usr/lib" ; then
  57 +                   NSS_LIBS="$NSS_LIBS_LIST"
  58 +                else
  59 +                   if test "z$with_gnu_ld" = "zyes" ; then
  60 +                       NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST"
  61 +                   else
  62 +                       NSS_LIBS="-L$dir $NSS_LIBS_LIST"
  63 +                   fi
  64 +               fi
  65 +               NSS_LIBS_FOUND="yes"
  66 +               break
  67 +           fi
  68 +              ;;
  69 +
  70 +            *)
  71              if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
  72                 dnl do not add -L/usr/lib because compiler does it anyway
  73                 if test "z$dir" = "z/usr/lib" ; then
  74 @@ -757,6 +800,8 @@
  75                 NSS_LIBS_FOUND="yes"
  76                 break
  77             fi
  78 +              ;;
  79 +            esac
  80         done
  81      fi
  82
  83 @@ -927,7 +972,7 @@
  84  dnl cannot detect __stdcall functions
  85  dnl    AC_CHECK_LIB(crypt32, CertOpenStore, ....
  86      LIBS_SAVE="$LIBS"
  87 -    LIBS="$LIBS -lcrypt32"
  88 +    LIBS="$LIBS ${PSDK_HOME}/lib/crypt32.lib"
  89      AC_MSG_CHECKING(for mscrypto libraries)
  90      AC_LINK_IFELSE([
  91         #include <windows.h>
  92 @@ -944,15 +989,7 @@
  93      XMLSEC_NO_MSCRYPTO="0"
  94
  95      MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
  96 -    case $host in
  97 -       *-*-mingw*)
  98 -               dnl since mingw crypt32 library is limited
  99 -               dnl we use own def-file
 100 -               MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';;
 101 -       *)
 102 -               MSCRYPTO_LIBS="-lcrypt32";;
 103 -    esac
 104 -
 105 +    MSCRYPTO_LIBS="${PSDK_HOME}/lib/crypt32.lib"
 106      dnl first crypto library is default one
 107      if test "z$XMLSEC_CRYPTO" = "z" ; then
 108         XMLSEC_CRYPTO="mscrypto"
 109 --- misc/xmlsec1-1.2.14/ltmain.sh       2009-06-25 22:53:19.000000000 +0200
 110 +++ misc/build/xmlsec1-1.2.14/ltmain.sh 2009-09-29 15:49:39.628349554 +0200
 111 @@ -4868,6 +4868,11 @@
 112         fi
 113         ;;
 114
 115 +      *.lib)
 116 +       deplibs="$deplibs $arg"
 117 +       continue
 118 +       ;;
 119 +
 120        *.$libext)
 121         # An archive.
 122         deplibs="$deplibs $arg"
 123 @@ -5213,6 +5218,10 @@
 124           continue
 125           ;;
 126         *.la) lib="$deplib" ;;
 127 +       *.lib)
 128 +         deplibs="$deplib $deplibs"
 129 +         continue
 130 +         ;;
 131         *.$libext)
 132           if test "$pass" = conv; then
 133             deplibs="$deplib $deplibs"
 134 --- misc/xmlsec1-1.2.14/src/nss/keywrapers.c    2009-09-29 15:55:33.430875248 +0200
 135 +++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c      2009-09-29 15:49:39.749963247 +0200
 136 @@ -1126,6 +1126,7 @@
 137      NULL,                   /* void* reserved1; */
 138  };
 139
 140 +#ifndef __MINGW32__
 141  /**
 142   * xmlSecNssTransformKWAes128GetKlass:
 143   *
 144 @@ -1160,6 +1161,7 @@
 145  xmlSecNssTransformKWAes256GetKlass(void) {
 146      return(&xmlSecNssKWAes256Klass);
 147  }
 148 +#endif /* __MINGW32__ */
 149
 150  #endif /* XMLSEC_NO_AES */
 151
 152 @@ -1197,6 +1199,7 @@
 153      NULL,                   /* void* reserved1; */
 154  };
 155
 156 +#ifndef __MINGW32__
 157  /**
 158   * xmlSecNssTransformKWDes3GetKlass:
 159   *
 160 @@ -1208,6 +1211,7 @@
 161  xmlSecNssTransformKWDes3GetKlass(void) {
 162      return(&xmlSecNssKWDes3Klass);
 163  }
 164 +#endif /* __MINGW32__ */
 165
 166  #endif /* XMLSEC_NO_DES */
 167