Mercurial > hg > mxe

changeset 3086:5a985098f4c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix shared lib build for curl
author John W. Eaton <jwe@octave.org>
date Mon, 10 Dec 2012 17:13:50 -0500
parents 1122ae1e98b6
children 0dd648719028
files src/curl.mk
diffstat 1 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/curl.mk
+++ b/src/curl.mk
@@ -19,7 +19,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --enable-static --disable-shared \
+        $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-gnutls \
         --with-libidn \
@@ -33,12 +33,4 @@
 ##        '$(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) -m755 '$(PREFIX)/$(TARGET)/lib/libcurl.dll.a' '$(PREFIX)/$(TARGET)/lib/libcurl.dll.a'; \
-      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libcurl.dll' '$(PREFIX)/$(TARGET)/bin/libcurl.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libcurl.dll'; \
-      rm -f '$(PREFIX)/$(TARGET)/lib/libcurl.la'; \
-    fi
 endef