Mercurial > mxe-octave

changeset 2866:028eabbb0f76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include curl as a dependency of Octave. Kluge shared library builds for curl, libgcrypt libgpg_error, and libssh2 packages.
author John W. Eaton <jwe@octave.org>
date Mon, 26 Nov 2012 23:05:25 -0500
parents 5ebec6b3a79c
children f4b0021b125a
files src/curl.mk src/libgcrypt.mk src/libgpg_error.mk src/libssh2.mk src/octave.mk
diffstat 5 files changed, 40 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/curl.mk	Fri Nov 16 14:43:56 2012 -0500
+++ b/src/curl.mk	Mon Nov 26 23:05:25 2012 -0500
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        $(ENABLE_SHARED_OR_STATIC) \
+        --enable-static --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-gnutls \
         --with-libidn \
@@ -28,8 +28,16 @@
         --with-libssh2
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 
-    '$(TARGET)-gcc' \
-        -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-curl.exe' \
-        `'$(TARGET)-pkg-config' libcurl --cflags --libs`
+##    '$(TARGET)-gcc' \
+##        -W -Wall -Werror -ansi -pedantic \
+##        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-curl.exe' \
+##        `'$(TARGET)-pkg-config' libcurl --cflags --libs`
+
+    if [ "$(BUILD_SHARED)" = yes ]; then \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libcurl.a' -lssh2; \
+      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
+      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libcurl.dll.a' '$(PREFIX)/$(TARGET)/lib/libcurl.dll.a'; \
+      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libcurl.dll' '$(PREFIX)/$(TARGET)/bin/libcurl.dll'; \
+      rm -f '$(PREFIX)/$(TARGET)/lib/libcurl.dll'; \
+    fi
 endef
--- a/src/libgcrypt.mk	Fri Nov 16 14:43:56 2012 -0500
+++ b/src/libgcrypt.mk	Mon Nov 26 23:05:25 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        $(ENABLE_SHARED_OR_STATIC) \
+        --enable-static --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-gpg-error-prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
@@ -30,4 +30,12 @@
         -W -Wall -Werror -ansi -pedantic \
         '$(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) -m644 '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll.a' '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll.a'; \
+      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll' '$(PREFIX)/$(TARGET)/bin/libgcrypt.dll'; \
+      rm -f '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll'; \
+    fi
 endef
--- a/src/libgpg_error.mk	Fri Nov 16 14:43:56 2012 -0500
+++ b/src/libgpg_error.mk	Mon Nov 26 23:05:25 2012 -0500
@@ -19,10 +19,17 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        $(ENABLE_SHARED_OR_STATIC) \
+        --enable-static --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls \
         --disable-languages
     $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    if [ "$(BUILD_SHARED)" = yes ]; then \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libgpg-error.a'; \
+      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
+      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll.a' '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll.a'; \
+      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll' '$(PREFIX)/$(TARGET)/bin/libgpg-error.dll'; \
+      rm -f '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll'; \
+    fi
 endef
--- a/src/libssh2.mk	Fri Nov 16 14:43:56 2012 -0500
+++ b/src/libssh2.mk	Mon Nov 26 23:05:25 2012 -0500
@@ -20,7 +20,7 @@
     cd '$(1)' && ./buildconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        $(ENABLE_SHARED_OR_STATIC) \
+        --enable-static --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-openssl \
         --with-libgcrypt \
@@ -31,4 +31,12 @@
         -W -Wall -Werror -ansi -pedantic \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libssh2.exe' \
         `'$(TARGET)-pkg-config' --cflags --libs libssh2`
+
+    if [ "$(BUILD_SHARED)" = yes ]; then \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libssh2.a' -lgcrypt; \
+      $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
+      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libssh2.dll.a' '$(PREFIX)/$(TARGET)/lib/libssh2.dll.a'; \
+      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libssh2.dll' '$(PREFIX)/$(TARGET)/bin/libssh2.dll'; \
+      rm -f '$(PREFIX)/$(TARGET)/lib/libssh2.dll'; \
+    fi
 endef
--- a/src/octave.mk	Fri Nov 16 14:43:56 2012 -0500
+++ b/src/octave.mk	Mon Nov 26 23:05:25 2012 -0500
@@ -6,7 +6,7 @@
 $(PKG)_CHECKSUM := 1ea936554aaabaabb747a4fcf98ecfbbfb265656
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://jweaton.org/$($(PKG)_FILE)
-$(PKG)_DEPS     := blas lapack pcre readline gcc
+$(PKG)_DEPS     := blas curl gcc lapack pcre readline
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;