Mercurial > mxe-octave

diff src/libgcrypt.mk @ 2908:b9db9b09d641

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix shared library build for libgcrypt
author John W. Eaton <jwe@octave.org>
date Tue, 11 Dec 2012 11:47:34 -0500
parents 0ccb93276a9f
children 4f9b72cf7ee7
line wrap: on
line diff
--- 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