Mercurial > hg > mxe

changeset 3087:0dd648719028

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix shared lib build for gnutls
author John W. Eaton <jwe@octave.org>
date Mon, 10 Dec 2012 20:39:02 -0500
parents 5a985098f4c9
children 69cc6151a9e0
files src/gnutls.mk
diffstat 1 files changed, 1 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -27,7 +27,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --enable-static --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls \
         --disable-guile \
@@ -40,28 +40,6 @@
         ac_cv_prog_AR='$(TARGET)-ar'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 
-    if [ $(BUILD_SHARED) = yes ]; then \
-      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
- \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libgnutls.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutls.dll.a' '$(PREFIX)/$(TARGET)/lib/libgnutls.dll.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutls.dll' '$(PREFIX)/$(TARGET)/bin/libgnutls.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libgnutls.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libgnutls.la'; \
- \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-g++' '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.dll.a' '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.dll.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.dll' '$(PREFIX)/$(TARGET)/bin/libgnutlsxx.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libgnutlsxx.la'; \
- \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-g++' '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.dll.a' '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.dll.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.dll' '$(PREFIX)/$(TARGET)/bin/libgnutls-openssl.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libgnutls-openssl.la'; \
-    fi
-
 ##    '$(TARGET)-gcc' \
 ##        -W -Wall -Werror -ansi -pedantic \
 ##        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \