contribs win64: fix libgcrypt linking

diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 1b0e12c91852751479a29ecf8d8efbd1ac4f4924..90f2c5c71802871e71f095fac2cb240510604104 100644 (file)
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -16,8 +16,11 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 
 DEPS_gcrypt = gpg-error
 
+ifdef HAVE_WIN64
+ac_cv_sys_symbol_underscore=no
+endif
 .gcrypt: libgcrypt
        #$(RECONF)
-       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-pubkey-ciphers=dsa
+       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-pubkey-ciphers=dsa ac_cv_sys_symbol_underscore=$(ac_cv_sys_symbol_underscore)
        cd $< && $(MAKE) install
        touch $@

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index ffa72ca630cfea4b5924e4f08be20ace485ec907..79577930c827a235a7275cdd027a608746b72d1a 100644 (file)
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1852,9 +1852,12 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa
 
+ifdef HAVE_WIN64
+ac_cv_sys_symbol_underscore=no
+endif
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls ac_cv_sys_symbol_underscore=$(ac_cv_sys_symbol_underscore) && make && make install)
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -lgpg-error" $(CIPHDIG) && make && make install)
 endif