diff --git a/build_tor_linux.py b/build_tor_linux.py index d99752e7896b47fbdd399aca9eaaea204e430a3b..a7b8c5f683c9d57de00fb1216c03723eef8eed05 100755 --- a/build_tor_linux.py +++ b/build_tor_linux.py @@ -59,11 +59,6 @@ def build_linux_arch(arch, gcc_arch, cc_env, openssl_target, autogen_host, versi ] + XZ_CONFIGURE_FLAGS, cwd=xz_dir, env=env) check_call(['make', '-j', str(os.cpu_count()), 'install'], cwd=xz_dir, env=env) - # build zstd - zstd_dir = os.path.join(BUILD_DIR, 'zstd', "lib") - check_call(['make', '-j', str(os.cpu_count()), 'DESTDIR=%s' % prefix_dir, 'PREFIX=""', 'install'], - cwd=zstd_dir, env=env) - # build zlib zlib_dir = os.path.join(BUILD_DIR, 'zlib') check_call(['./configure', '--prefix=%s' % prefix_dir], cwd=zlib_dir, env=env) @@ -102,7 +97,6 @@ def build_linux_arch(arch, gcc_arch, cc_env, openssl_target, autogen_host, versi '--host=%s' % autogen_host, '--prefix=%s' % prefix_dir, '--enable-lzma', - '--enable-zstd', '--enable-static-zlib', '--with-zlib-dir=%s' % prefix_dir, '--enable-static-libevent', diff --git a/tor-versions.json b/tor-versions.json index 118104d478ea81d51f11de744cce4236fa5dfbe7..4f1ed7972b55c75d3b7359cfa17af9f3fe92e884 100644 --- a/tor-versions.json +++ b/tor-versions.json @@ -20,10 +20,6 @@ "url": "https://github.com/madler/zlib.git", "commit": "v1.2.12" }, - "zstd": { - "url": "https://github.com/facebook/zstd.git", - "commit": "v1.4.9" - }, "ndk": { "url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip", "revision": "21.4.7075529", diff --git a/utils.py b/utils.py index ef478b467a62a2ac3f6c71bd12d9f41b82e127bd..f6a71afbd312ed140ce203c5e3d9eb3ea0220a88 100644 --- a/utils.py +++ b/utils.py @@ -85,7 +85,6 @@ def prepare_repos(versions): prepare_repo(os.path.join(BUILD_DIR, "openssl"), versions['openssl']['url'], versions['openssl']['commit']) prepare_repo(os.path.join(BUILD_DIR, "xz"), versions['xz']['url'], versions['xz']['commit']) prepare_repo(os.path.join(BUILD_DIR, "zlib"), versions['zlib']['url'], versions['zlib']['commit']) - prepare_repo(os.path.join(BUILD_DIR, "zstd"), versions['zstd']['url'], versions['zstd']['commit']) def prepare_repo(path, url, version):