diff options
| author | wsnipex <wsnipex@a1.net> | 2019-01-03 13:33:02 +0100 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2019-01-04 12:51:45 +0100 |
| commit | 6285fb4b074ba93e90a772a7fdfa3a3801625321 (patch) | |
| tree | f0011907d9dfd1c32dc402917645e5a8ed5bd850 /tools/depends | |
| parent | 195fd1cdfc2c3384586468a573de6c1deed5bc86 (diff) | |
[depends] add http2 support to curl via nghttp2
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/Makefile | 4 | ||||
| -rw-r--r-- | tools/depends/target/curl/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/nghttp2/Makefile | 38 |
3 files changed, 41 insertions, 3 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 493213d27c..d57a784fb3 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -7,7 +7,7 @@ endif DEPENDS = \ pcre expat gettext sqlite3 libgpg-error \ libgcrypt bzip2 libfstrcmp liblzo2 libzip freetype2 fontconfig \ - openssl gmp nettle gnutls curl \ + openssl gmp nettle gnutls curl nghttp2 \ libjpeg-turbo libpng fribidi libass \ libxml2 rapidjson libmicrohttpd mariadb libffi \ python27 libshairplay libfmt \ @@ -90,7 +90,7 @@ all: .installed-$(PLATFORM) gettext: $(ICONV) libgcrypt: libgpg-error fontconfig: freetype2 expat $(ICONV) -curl: openssl +curl: openssl nghttp2 libass: fontconfig fribidi libpng freetype2 expat $(ICONV) libmicrohttpd: gnutls libgcrypt libgpg-error python27: expat gettext libxml2 sqlite3 openssl libffi diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile index 0cc2a931c6..4a3355a6f8 100644 --- a/tools/depends/target/curl/Makefile +++ b/tools/depends/target/curl/Makefile @@ -10,7 +10,7 @@ ARCHIVE=$(SOURCE).tar.bz2 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ ./configure --prefix=$(PREFIX) --disable-shared --disable-ldap \ --without-libssh2 --disable-ntlm-wb --enable-ipv6 --without-librtmp \ - --with-ca-fallback --with-ssl=$(PREFIX) + --with-ca-fallback --with-ssl=$(PREFIX) --with-nghttp2=$(PREFIX) LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a diff --git a/tools/depends/target/nghttp2/Makefile b/tools/depends/target/nghttp2/Makefile new file mode 100644 index 0000000000..44aa8acc7d --- /dev/null +++ b/tools/depends/target/nghttp2/Makefile @@ -0,0 +1,38 @@ +include ../../Makefile.include +DEPS= ../../Makefile.include Makefile + +# lib name, version +LIBNAME=nghttp2 +VERSION=1.35.1 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz + +# configuration settings +CONFIGURE=./configure --prefix=$(PREFIX) --enable-lib-only --disable-shared + +LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a + +all: .installed-$(PLATFORM) + +$(TARBALLS_LOCATION)/$(ARCHIVE): + cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) + +$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) + rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) + cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); $(AUTORECONF) -vif + cd $(PLATFORM); $(CONFIGURE) + +$(LIBDYLIB): $(PLATFORM) + $(MAKE) -C $(PLATFORM) + +.installed-$(PLATFORM): $(LIBDYLIB) + $(MAKE) -C $(PLATFORM) install + touch $@ + +clean: + $(MAKE) -C $(PLATFORM) clean + rm -f .installed-$(PLATFORM) + +distclean:: + rm -rf $(PLATFORM) .installed-$(PLATFORM) + |