Mercurial > mxe-octave
diff src/curl.mk @ 2866:028eabbb0f76
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 | 47558e958113 |
| children | c766e4afd493 |
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