diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2022-05-02 12:05:37 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 12:05:37 +1000 |
| commit | f287df8ec2ca18673e79ff33c4c3814a04a655b5 (patch) | |
| tree | dc8377af8a4ca3a8ee26291072beef1eb75d517d /tools/depends/target | |
| parent | 699930dfb623ffdeb34d19012df2bf82205dd505 (diff) | |
| parent | 7a39cea8be213911feea2db416ac11cd9bc4ebc5 (diff) | |
Merge pull request #21312 from fuzzard/depends_nghttp2
[tools/depends][target] nghttp2 use cmake build system
Diffstat (limited to 'tools/depends/target')
| -rw-r--r-- | tools/depends/target/nghttp2/Makefile | 42 | ||||
| -rw-r--r-- | tools/depends/target/nghttp2/NGHTTP2-VERSION | 5 |
2 files changed, 19 insertions, 28 deletions
diff --git a/tools/depends/target/nghttp2/Makefile b/tools/depends/target/nghttp2/Makefile index 731bec24f4..339f5e47a2 100644 --- a/tools/depends/target/nghttp2/Makefile +++ b/tools/depends/target/nghttp2/Makefile @@ -1,46 +1,32 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile ../../download-files.include - -# lib name, version -LIBNAME=nghttp2 -VERSION=1.46.0 -ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz -SHA512=fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b -include ../../download-files.include +include ../../Makefile.include NGHTTP2-VERSION ../../download-files.include +DEPS = ../../Makefile.include NGHTTP2-VERSION Makefile ../../download-files.include # configuration settings -# no extra libs are required when using --enable-lib-only -CONFIGURE=./configure --prefix=$(PREFIX) --enable-lib-only --disable-shared \ - --without-jansson \ - --without-libevent-openssl \ - --without-libcares \ - --without-libev \ - --without-cunit \ - --without-openssl \ - --without-zlib - -LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a +CMAKE_OPTIONS=-DENABLE_DEBUG=OFF \ + -DENABLE_FAILMALLOC=OFF \ + -DENABLE_LIB_ONLY=ON \ + -DENABLE_STATIC_LIB=ON \ + -DENABLE_SHARED_LIB=OFF -all: .installed-$(PLATFORM) +LIBDYLIB=$(PLATFORM)/build/lib/$(BYPRODUCT) +all: .installed-$(PLATFORM) $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) - rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) + rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)/build cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); $(AUTORECONF) -vif - cd $(PLATFORM); $(CONFIGURE) + cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. $(LIBDYLIB): $(PLATFORM) - $(MAKE) -C $(PLATFORM) + $(MAKE) -C $(PLATFORM)/build .installed-$(PLATFORM): $(LIBDYLIB) - $(MAKE) -C $(PLATFORM) install + $(MAKE) -C $(PLATFORM)/build install touch $@ clean: - $(MAKE) -C $(PLATFORM) clean + $(MAKE) -C $(PLATFORM)/build clean rm -f .installed-$(PLATFORM) distclean:: rm -rf $(PLATFORM) .installed-$(PLATFORM) - diff --git a/tools/depends/target/nghttp2/NGHTTP2-VERSION b/tools/depends/target/nghttp2/NGHTTP2-VERSION new file mode 100644 index 0000000000..998667c1fc --- /dev/null +++ b/tools/depends/target/nghttp2/NGHTTP2-VERSION @@ -0,0 +1,5 @@ +LIBNAME=nghttp2 +VERSION=1.46.0 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz +SHA512=fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b +BYPRODUCT=libnghttp2.a |