From 96781e5d603435e653c6662a998765283a7261a4 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Mon, 16 Jun 2025 22:22:43 +0200 Subject: [PATCH] depends: tor_mingw32: build from source --- contrib/depends/packages/packages.mk | 2 +- contrib/depends/packages/tor_mingw32.mk | 40 +++++++++++++++++++++---- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index 95cd7fd7..7d8651f0 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -18,4 +18,4 @@ qt_mingw32_packages := qt tor_linux_packages := libevent tor_linux tor_darwin_packages := tor_darwin -tor_mingw32_packages := tor_mingw32 +tor_mingw32_packages := libevent tor_mingw32 diff --git a/contrib/depends/packages/tor_mingw32.mk b/contrib/depends/packages/tor_mingw32.mk index 3b211f9f..db7be54a 100644 --- a/contrib/depends/packages/tor_mingw32.mk +++ b/contrib/depends/packages/tor_mingw32.mk @@ -1,10 +1,40 @@ package=tor_mingw32 $(package)_version=0.4.8.16 -$(package)_download_path=https://dist.torproject.org/torbrowser/14.0.9/ -$(package)_file_name=tor-expert-bundle-windows-x86_64-14.0.9.tar.gz -$(package)_sha256_hash=dce4dfd488ed8220b97c613f08216b63c6895bbefd0d091a3156501f188fe5f4 +$(package)_download_path=https://dist.torproject.org/ +$(package)_file_name=tor-$($(package)_version).tar.gz +$(package)_sha256_hash=6540dd377a120fb8e7d27530aa3b7ff72a0fa5b4f670fe1d64c987c1cfd390cb +$(package)_dependencies=libevent openssl zlib + +define $(package)_set_vars + $(package)_config_opts=--disable-asciidoc --disable-manpage --disable-html-manual --disable-system-torrc + $(package)_config_opts+=--disable-module-relay --disable-lzma --disable-zstd + $(package)_config_opts+=--with-libevent-dir=$(host_prefix) --with-openssl-dir=$(host_prefix) + $(package)_config_opts+=--with-zlib-dir=$(host_prefix) --disable-tool-name-check --enable-fatal-warnings + $(package)_config_opts+=--prefix=$(host_prefix) + $(package)_config_opts_x86_64+=--enable-static-tor + $(package)_cflags+=-O1 + $(package)_cxxflags+=-O1 + $(package)_ldflags+=$(guix_ldflags) +endef + +define $(package)_preprocess_cmds + rm -rf doc/man +endef + +define $(package)_config_cmds + $($(package)_autoconf) $($(package)_config_opts) +endef + +define $(package)_build_cmds + $(MAKE) +endef define $(package)_stage_cmds - mkdir -p $($(package)_staging_prefix_dir)/Tor/ && \ - cp tor.exe $($(package)_staging_prefix_dir)/Tor/ + $(MAKE) DESTDIR=$($(package)_staging_dir) install +endef + +define $(package)_postprocess_cmds + $(host_toolchain)strip -s -D bin/tor.exe && \ + mkdir $($(package)_staging_prefix_dir)/Tor/ && \ + cp bin/tor.exe $($(package)_staging_prefix_dir)/Tor endef -- 2.52.0