Mercurial > mxe-octave

changeset 2877:5d6a0103c1fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build shared libs from static libs for gnutls
author John W. Eaton <jwe@octave.org>
date Wed, 28 Nov 2012 19:56:21 -0500
parents c766e4afd493
children b40c2cbbcb88
files src/gnutls.mk
diffstat 1 files changed, 27 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/gnutls.mk	Wed Nov 28 19:42:55 2012 -0500
+++ b/src/gnutls.mk	Wed Nov 28 19:56:21 2012 -0500
@@ -27,7 +27,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        $(ENABLE_SHARED_OR_STATIC) \
+        --enable-static --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls \
         --disable-guile \
@@ -40,8 +40,30 @@
         ac_cv_prog_AR='$(TARGET)-ar'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 
-    '$(TARGET)-gcc' \
-        -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \
-        `'$(TARGET)-pkg-config' gnutls --cflags --libs`
+    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' \
+##        `'$(TARGET)-pkg-config' gnutls --cflags --libs`
 endef