diff --git a/tor-build/Makefile b/tor-build/Makefile index e265b2861456ceb3f34233ab281d67ea22bf6d8a..62952a0b5b8f24bb7f104aa7735bdde6cb9f0e9f 100644 --- a/tor-build/Makefile +++ b/tor-build/Makefile @@ -99,7 +99,6 @@ INSTALL_DIR := $(EXTERNAL_ROOT)/lib/$(APP_ABI) openssl-clean \ libevent-clean \ lzma-clean \ - zstd-clean \ tor tor-clean all: test-setup tor @@ -213,39 +212,6 @@ lzma-clean: -cd xz && \ git clean -fdx > /dev/null - -#------------------------------------------------------------------------------# -# zstd - -zstd-build-stamp: - $(MAKE) -C zstd/lib \ - PREFIX=$(EXTERNAL_ROOT) \ - libzstd.a-mt - $(MAKE) -C zstd/lib \ - PREFIX=$(EXTERNAL_ROOT) \ - libzstd.pc - test -d lib || mkdir lib - test -d lib/pkgconfig || mkdir lib/pkgconfig - test -d include || mkdir include - cp zstd/lib/libzstd.a lib - cp zstd/lib/libzstd.pc lib/pkgconfig - cp zstd/lib/zstd.h include - cp zstd/lib/common/zstd_errors.h include - cp zstd/lib/deprecated/zbuff.h include - cp zstd/lib/dictBuilder/zdict.h include - touch $@ - -zstd-clean: - -rm -f include/zstd.h include/zstd_errors.h include/zbuff.h include/zdict.h - -rm -f lib/libzstd.a - -rm -f lib/pkgconfig/libzstd.pc - -rm -f zstd-build-stamp - -$(MAKE) -C zstd uninstall - -$(MAKE) -C zstd clean - -cd zstd && \ - git clean -fdx > /dev/null - - #------------------------------------------------------------------------------# # tor @@ -259,7 +225,6 @@ tor/Makefile: tor/configure.ac tor/Makefile.am --enable-pic \ --enable-static-libevent --with-libevent-dir=$(EXTERNAL_ROOT) \ --enable-static-openssl --with-openssl-dir=$(EXTERNAL_ROOT) \ - --enable-zstd \ --disable-module-dirauth \ --disable-module-relay \ --disable-unittests \ @@ -276,7 +241,7 @@ tor-build-stamp: tor/Makefile $(NDK_TOOLCHAIN_BASE)/bin/$(ALTHOST)-strip -D $(OUTPUT_FILE) touch $@ -tor: lzma-build-stamp zstd-build-stamp libevent-build-stamp openssl-build-stamp tor-build-stamp +tor: lzma-build-stamp libevent-build-stamp openssl-build-stamp tor-build-stamp tor-clean: -rm -f $(OUTPUT_FILE) @@ -288,7 +253,7 @@ tor-clean: #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away -clean: openssl-clean libevent-clean lzma-clean zstd-clean tor-clean +clean: openssl-clean libevent-clean lzma-clean tor-clean #------------------------------------------------------------------------------#