]> git.webhop.me Git - bs-cst-neutrino-hd.git/commitdiff
update build libcurl
authorMarkham <markham001@gmx.de>
Wed, 11 Nov 2015 10:28:13 +0000 (11:28 +0100)
committerMarkham <markham001@gmx.de>
Wed, 11 Nov 2015 10:28:13 +0000 (11:28 +0100)
make/libraries.mk

index aaedb6d062a5e7d9836ed616c4fb3ffffe212be7..b086475a9da286af64b254b0f4d4597fc46c7030 100755 (executable)
@@ -121,17 +121,23 @@ $(D)/openssl: $(ARCHIVE)/openssl-1.0.1f.tar.gz | $(TARGETPREFIX)
        chmod 0755 $(TARGETPREFIX)/lib/libcrypto.so.* $(TARGETPREFIX)/lib/libssl.so.*
        touch $@
 
-$(D)/libcurl: $(ARCHIVE)/curl-7.35.0.tar.bz2 | $(TARGETPREFIX)
+$(D)/libcurl: $(ARCHIVE)/curl-7.35.0.tar.bz2 $(D)/openssl $(D)/librtmp $(D)/zlib | $(TARGETPREFIX)
        $(UNTAR)/curl-7.35.0.tar.bz2
-       pushd $(BUILD_TMP)/curl-7.35.0 && \
-               $(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) \
+       set -e; cd $(BUILD_TMP)/curl-7.35.0; \
+               $(BUILDENV) LIBS="-lssl -lcrypto -lrtmp -lz" \
+               ./configure \
+                       --prefix=${PREFIX} \
+                       --build=$(BUILD) \
+                       --host=$(TARGET) \
                        --disable-manual --disable-file --disable-rtsp --disable-dict \
-                       --disable-imap --disable-pop3 --disable-smtp --with-ssl \
-                       --with-random --mandir=/.remove && \
-               $(MAKE) all && \
-               mkdir -p $(HOSTPREFIX)/bin && \
-               sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < curl-config > $(HOSTPREFIX)/bin/curl-config && \
-               chmod 755 $(HOSTPREFIX)/bin/curl-config && \
+                       --disable-imap --disable-pop3 --disable-smtp --enable-shared \
+                       --with-random --mandir=/.remove \
+                       --with-ssl=$(TARGETPREFIX) \
+                       --with-librtmp=$(TARGETPREFIX)/lib; \
+               $(MAKE) all; \
+               mkdir -p $(HOSTPREFIX)/bin; \
+               sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < curl-config > $(HOSTPREFIX)/bin/curl-config; \
+               chmod 755 $(HOSTPREFIX)/bin/curl-config; \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        rm $(TARGETPREFIX)/bin/curl-config
        $(REWRITE_LIBTOOL)/libcurl.la