merge commit

3 files changed, 30 insertions, 74 deletions

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 817dc6d84658..2841bc487f78 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -49,7 +49,8 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 XMLSEC1VERSION=1.2.6
 
 TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch xmlsec1-1.2.6-mingwport24.patch
+
 
 ADDITIONAL_FILES= \
     include$/xmlsec$/nss$/akmngr.h \
@@ -87,7 +88,7 @@ xmlsec_LIBS+=-lstdc++_s
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) OBJDUMP="$(WRAPCMD) objdump"
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
@@ -120,7 +121,9 @@ xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS)
 xmlsec_CFLAGS+=$(EXTRA_CFLAGS)
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
-.ENDIF			# "$(SYSBASE)"!=""
+.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
+xmlsec_CPPFLAGS+=$(EXTRA_CDEFS)
+.ENDIF
 
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
 xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
@@ -139,7 +142,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
-CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB)
+CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
 # system-mozilla needs pkgconfig to get the information about nss
 # FIXME: This also will enable pkg-config usage for libxml2. It *seems*
 # that the internal headers still are used when they are there but....
diff --git a/libxmlsec/xmlsec1-1.2.6-mingwport24.patch b/libxmlsec/xmlsec1-1.2.6-mingwport24.patch
new file mode 100644
index 000000000000..faa1ee233fd7
--- /dev/null
+++ b/libxmlsec/xmlsec1-1.2.6-mingwport24.patch
@@ -0,0 +1,23 @@
+--- misc/xmlsec1-1.2.6/configure	2009-09-18 17:19:00.000000000 +0200
++++ misc/build/xmlsec1-1.2.6/configure	2009-09-18 17:18:43.000000000 +0200
+@@ -21749,6 +21749,10 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
++case $host_os in
++mingw*)
++;;
++*)
+ echo "$as_me:$LINENO: checking for shl_load" >&5
+ echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+ if test "${ac_cv_func_shl_load+set}" = set; then
+@@ -22299,7 +22303,8 @@
+ 
+ 
+ fi
+-
++;;
++esac
+ 
+ if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
+ then
diff --git a/libxmlsec/xmlsec1-1.2.6.patch b/libxmlsec/xmlsec1-1.2.6.patch
index eb5153d99a18..dc720e144c06 100644
--- a/libxmlsec/xmlsec1-1.2.6.patch
+++ b/libxmlsec/xmlsec1-1.2.6.patch
@@ -213,15 +213,6 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -24598,7 +24599,7 @@
- fi
- 
- LIBXML_MIN_VERSION="2.4.2"
--LIBXML_CONFIG="xml2-config"
-+LIBXML_CONFIG="./libxml2-config"
- LIBXML_CFLAGS=""
- LIBXML_LIBS=""
- LIBXML_FOUND="no"
 @@ -25678,12 +25679,26 @@
  
  XMLSEC_NO_NSS="1"
@@ -2388,15 +2379,6 @@
  s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
 --- misc/xmlsec1-1.2.6/configure.in	2004-08-26 04:49:24.000000000 +0200
 +++ misc/build/xmlsec1-1.2.6/configure.in	2008-06-29 23:44:19.000000000 +0200
-@@ -143,7 +143,7 @@
- dnl find libxml
- dnl ==========================================================================
- LIBXML_MIN_VERSION="2.4.2"
--LIBXML_CONFIG="xml2-config"
-+LIBXML_CONFIG="./libxml2-config"
- LIBXML_CFLAGS=""
- LIBXML_LIBS=""
- LIBXML_FOUND="no"
 @@ -503,12 +503,26 @@
      
  XMLSEC_NO_NSS="1"
@@ -3076,58 +3058,6 @@
 +
 +#endif	/* __XMLSEC_NSS_TOKENS_H__ */
 +
---- misc/xmlsec1-1.2.6/libxml2-config	2008-06-29 23:44:40.000000000 +0200
-+++ misc/build/xmlsec1-1.2.6/libxml2-config	2008-06-29 23:44:19.000000000 +0200
-@@ -1 +1,48 @@
--dummy
-+#! /bin/sh
-+
-+if test "$SYSTEM_LIBXML" = "YES"
-+then xml2-config "$@"; exit 0
-+fi
-+
-+prefix=${SOLARVERSION}/${INPATH}
-+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
-+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
-+
-+while test $# -gt 0; do
-+    case "$1" in
-+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+    *) optarg= ;;
-+    esac
-+
-+    case "$1" in
-+    --prefix=*)
-+	prefix=$optarg
-+	includedir=$prefix/include
-+	libdir=$prefix/lib
-+	;;
-+
-+    --prefix)
-+	echo $prefix
-+	;;
-+
-+    --version)
-+	echo 2.5.4
-+	exit 0
-+	;;
-+
-+    --cflags)
-+       	echo -I${includedir} 
-+       	;;
-+
-+    --libs)
-+       	echo -L${libdir} ${LIBXML2LIB} ${ZLIB3RDLIB}   -lm  
-+       	;;
-+
-+    *)
-+	exit 1
-+	;;
-+    esac
-+    shift
-+done
-+
-+exit 0
 --- misc/xmlsec1-1.2.6/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
 +++ misc/build/xmlsec1-1.2.6/ltmain.sh	2008-06-29 23:44:19.000000000 +0200
 @@ -1661,6 +1661,11 @@