# HG changeset patch # User John W. Eaton # Date 1355244454 18000 # Node ID b9db9b09d6418f6d903d574ab6ebfcb8527406d6 # Parent 69cc6151a9e09eeface03b1f9655449eb6e3229b fix shared library build for libgcrypt diff -r 69cc6151a9e0 -r b9db9b09d641 src/libgcrypt-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libgcrypt-1-fixes.patch Tue Dec 11 11:47:34 2012 -0500 @@ -0,0 +1,30 @@ +--- a/src/libgcrypt.def 2012-12-11 00:47:11.023318261 -0500 ++++ b/src/libgcrypt.def 2012-12-11 00:49:09.935158211 -0500 +@@ -1,27 +1,3 @@ +-;; libgcrypt.defs - Exported symbols for W32 +-;; Copyright (C) 2003, 2007 Free Software Foundation, Inc. +-;; +-;; This file is part of Libgcrypt. +-;; +-;; Libgcrypt is free software; you can redistribute it and/or modify +-;; it under the terms of the GNU Lesser General Public License as +-;; published by the Free Software Foundation; either version 2.1 of +-;; the License, or (at your option) any later version. +-;; +-;; Libgcrypt is distributed in the hope that it will be useful, +-;; but WITHOUT ANY WARRANTY; without even the implied warranty of +-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-;; GNU Lesser General Public License for more details. +-;; +-;; You should have received a copy of the GNU Lesser General Public +-;; License along with this program; if not, write to the Free Software +-;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +-;; +- +-;; Note: This file should be updated manually and the ordinals shall +-;; never be changed. Also check libgcrypt.vers and visibility.h. +- +- + EXPORTS + gcry_check_version @1 + gcry_control @2 diff -r 69cc6151a9e0 -r b9db9b09d641 src/libgcrypt.mk --- a/src/libgcrypt.mk Mon Dec 10 20:53:25 2012 -0500 +++ b/src/libgcrypt.mk Tue Dec 11 11:47:34 2012 -0500 @@ -17,10 +17,10 @@ endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(1)' && autoreconf && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --enable-static --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= @@ -31,12 +31,4 @@ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgcrypt.exe' \ `$(TARGET)-libgcrypt-config --cflags --libs` - if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libgcrypt.a'; \ - $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll.a' '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll.a'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll' '$(PREFIX)/$(TARGET)/bin/libgcrypt.dll'; \ - rm -f '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll'; \ - rm -f '$(PREFIX)/$(TARGET)/lib/libgcrypt.la'; \ - fi endef