rebuild win32 builds with forcing winidn

rwinlib · Jul 8, 2017 · e5eb861 · e5eb861
1 parent 8c8cfe8
commit e5eb861
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/lib-openssl/PKGBUILD b/lib-openssl/PKGBUILD
@@ -85,6 +85,7 @@ build() {
     _variant_config+=("--with-ca-bundle=${MINGW_PREFIX}/ssl/certs/ca-bundle.crt")
   fi
   export curl_disallow_strtok_r="yes"
+  export CPPFLAGS="-DUSE_WIN32_IDN -DWINVER=0x0600"
   cd "${srcdir}/build-${CARCH}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -95,7 +96,7 @@ build() {
     --enable-static \
     --enable-shared \
     --enable-sspi \
-    --without-librtmp --with-winidn --without-nghttp2 \
+    --without-librtmp --with-winidn --without-libidn2 --without-nghttp2 \
     --with-libmetalink=${MINGW_PREFIX} \
     "${_variant_config[@]}" \
     "${extra_config[@]}"

diff --git a/lib-openssl/i386/libcurl.a b/lib-openssl/i386/libcurl.a
diff --git a/lib-winssl/PKGBUILD b/lib-winssl/PKGBUILD
@@ -86,6 +86,7 @@ build() {
     _variant_config+=('--with-nghttp2=${MINGW_PREFIX}/')
   fi
   export curl_disallow_strtok_r="yes"
+  export CPPFLAGS="-DUSE_WIN32_IDN -DWINVER=0x0600"
   cd "${srcdir}/build-${CARCH}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -96,7 +97,7 @@ build() {
     --enable-static \
     --enable-shared \
     --enable-sspi \
-    --without-libssh2 --without-librtmp --with-winidn \
+    --without-libssh2 --without-librtmp --without-libidn2 --with-winidn \
     --with-libmetalink=${MINGW_PREFIX} \
     "${_variant_config[@]}" \
     "${extra_config[@]}"

diff --git a/lib-winssl/i386/libcurl.a b/lib-winssl/i386/libcurl.a
diff --git a/readme.md b/readme.md
@@ -1,13 +1,21 @@
-This libcurl was built with msys2. We only added
-
-	export curl_disallow_strtok_r="yes"
-
-The OpenSSL build has to be linked using:
+This libcurl was built with msys2. The OpenSSL build has to be linked using:
 
     -lcurl -lssh2 -lz -lssl -lcrypto -lgdi32 -lws2_32 -lcrypt32 -lwldap32
 
 The WinSSL (native SecureChannel) build has to be linked using:
 
-    -lcurl -lz -lws2_32 -lcrypt32 -lwldap32
+    -lcurl -lz -lws2_32 -lcrypt32 -lwldap32	
 
-Both libs were compiled with native Windows SSPI and IDN.
+Both builds are configured with:
+
+	--with-winidn
+	--enable-sspi
+	--without-librtmp 
+	--without-libidn2
+
+We also used the following vars:
+
+	export curl_disallow_strtok_r="yes"
+ 	export CPPFLAGS="-DUSE_WIN32_IDN -DWINVER=0x0600"	
+
+The latter is needed to work around an autoconf bug which does not correclty detect winidn on mingw32.