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