* [Buildroot] [PATCH 1/2] package/tor: add -lz to fix static builds
@ 2022-04-29 18:37 Bernd Kuhls
2022-04-29 18:37 ` [Buildroot] [PATCH 2/2] package/tor: bump version to 0.4.7.7 Bernd Kuhls
2022-04-30 18:51 ` [Buildroot] [PATCH 1/2] package/tor: add -lz to fix static builds Arnout Vandecappelle
0 siblings, 2 replies; 3+ messages in thread
From: Bernd Kuhls @ 2022-04-29 18:37 UTC (permalink / raw)
To: buildroot
In order to remove a patch which needs frequent updates on major version
bumps and to get rid of autoreconf we just add -lz when creating a static
build. This make sure that static linking occurs in the right order.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
Tested using this defconfig
BR2_PACKAGE_XZ=y
BR2_PACKAGE_ZSTD=y
BR2_PACKAGE_TOR=y
andes-nds32 [ 1/45]: OK
arm-aarch64 [ 2/45]: OK
bootlin-aarch64-glibc [ 3/45]: OK
bootlin-arcle-hs38-uclibc [ 4/45]: OK
bootlin-armv5-uclibc [ 5/45]: OK
bootlin-armv7-glibc [ 6/45]: OK
bootlin-armv7m-uclibc [ 7/45]: SKIPPED
bootlin-armv7-musl [ 8/45]: OK
bootlin-m68k-5208-uclibc [ 9/45]: SKIPPED
bootlin-m68k-68040-uclibc [10/45]: OK
bootlin-microblazeel-uclibc [11/45]: OK
bootlin-mipsel32r6-glibc [12/45]: OK
bootlin-mipsel-uclibc [13/45]: OK
bootlin-nios2-glibc [14/45]: OK
bootlin-openrisc-uclibc [15/45]: OK
bootlin-powerpc64le-power8-glibc [16/45]: OK
bootlin-powerpc-e500mc-uclibc [17/45]: OK
bootlin-riscv32-glibc [18/45]: OK
bootlin-riscv64-glibc [19/45]: OK
bootlin-riscv64-musl [20/45]: OK
bootlin-sh4-uclibc [21/45]: OK
bootlin-sparc64-glibc [22/45]: OK
bootlin-sparc-uclibc [23/45]: OK
bootlin-x86-64-glibc [24/45]: OK
bootlin-x86-64-musl [25/45]: OK
bootlin-x86-64-uclibc [26/45]: OK
bootlin-xtensa-uclibc [27/45]: OK
br-arm-basic [28/45]: OK
br-arm-full-nothread [29/45]: SKIPPED
br-arm-full-static [30/45]: OK
br-i386-pentium4-full [31/45]: OK
br-i386-pentium-mmx-musl [32/45]: OK
br-mips64-n64-full [33/45]: OK
br-mips64r6-el-hf-glibc [34/45]: OK
br-powerpc-603e-basic-cpp [35/45]: OK
br-powerpc64-power7-glibc [36/45]: OK
linaro-aarch64-be [37/45]: OK
linaro-aarch64 [38/45]: OK
linaro-arm [39/45]: OK
sourcery-arm-armv4t [40/45]: OK
sourcery-arm [41/45]: OK
sourcery-arm-thumb2 [42/45]: OK
sourcery-mips64 [43/45]: OK
sourcery-mips [44/45]: OK
sourcery-nios2 [45/45]: OK
45 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
...0001-Fix-static-linking-with-OpenSSL.patch | 94 -------------------
package/tor/tor.mk | 7 +-
2 files changed, 5 insertions(+), 96 deletions(-)
delete mode 100644 package/tor/0001-Fix-static-linking-with-OpenSSL.patch
diff --git a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
deleted file mode 100644
index 26ed6fe819..0000000000
--- a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From ba6b8ee5b6dee19493a150c3715b0e202440d206 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Thu, 24 Jan 2019 18:19:51 +0100
-Subject: [PATCH] Fix static linking with OpenSSL
-
-Adjust link order of libz to solve bug with static linking
-and remove host paths when looking for openssl.
-
-[Vincent:
- - Adapt the patch to make it apply on the new version.]
-[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10,
- 0.3.4.8, 0.3.5.7, 0.4.4.5, 0.4.5.6 & 0.4.6.7]
-[Fabrice: fix detection of openssl functions in 0.3.5.8]
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- configure.ac | 4 ++--
- src/test/include.am | 8 ++++----
- src/tools/include.am | 4 ++--
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 05e1392cf..580befa6b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1074,7 +1074,7 @@ AC_ARG_WITH(ssl-dir,
- ])
-
- AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
--TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32],
-+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32],
- [#include <openssl/ssl.h>
- char *getenv(const char *);],
- [struct ssl_cipher_st;
-@@ -1104,7 +1104,7 @@ dnl Now check for particular openssl functions.
- save_LIBS="$LIBS"
- save_LDFLAGS="$LDFLAGS"
- save_CPPFLAGS="$CPPFLAGS"
--LIBS="$TOR_OPENSSL_LIBS $LIBS"
-+LIBS="$TOR_OPENSSL_LIBS -lz $LIBS"
- LDFLAGS="$TOR_LDFLAGS_openssl $LDFLAGS"
- CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS"
-
-diff --git a/src/test/include.am b/src/test/include.am
-index ecb768957..39a622e88 100644
---- a/src/test/include.am
-+++ b/src/test/include.am
-@@ -399,8 +399,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB)
- src_test_test_ntor_cl_LDADD = \
- libtor.a \
- $(rust_ldadd) \
-- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
-- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-+ @TOR_LIB_MATH@ \
-+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
- @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ @TOR_TRACE_LIBS@
- src_test_test_ntor_cl_AM_CPPFLAGS = \
- $(AM_CPPFLAGS)
-@@ -409,8 +409,8 @@
- src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB)
- src_test_test_hs_ntor_cl_LDADD = \
- libtor.a \
-- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
-- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \
-+ @TOR_LIB_MATH@ \
-+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \
- @CURVE25519_LIBS@ @TOR_TRACE_LIBS@
- src_test_test_hs_ntor_cl_AM_CPPFLAGS = \
- $(AM_CPPFLAGS)
-diff --git a/src/tools/include.am b/src/tools/include.am
-index f7aa7e0d1..4c4e8aa7a 100644
---- a/src/tools/include.am
-+++ b/src/tools/include.am
-@@ -35,7 +35,7 @@ src_tools_tor_gencert_LDADD = \
- $(TOR_CRYPTO_LIBS) \
- $(TOR_UTIL_LIBS) \
- $(rust_ldadd) \
-- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \
-+ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \
- @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@
- endif
-
-@@ -45,7 +45,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \
- src/trunnel/libor-trunnel.a \
- $(TOR_CRYPTO_LIBS) \
- $(TOR_UTIL_LIBS) \
-- @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
-+ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \
- @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@
-
- if USE_NSS
---
-2.20.1
diff --git a/package/tor/tor.mk b/package/tor/tor.mk
index d16b3541eb..78a6de66dc 100644
--- a/package/tor/tor.mk
+++ b/package/tor/tor.mk
@@ -11,7 +11,6 @@ TOR_LICENSE_FILES = LICENSE
TOR_CPE_ID_VENDOR = torproject
TOR_SELINUX_MODULES = tor
TOR_DEPENDENCIES = libevent openssl zlib
-TOR_AUTORECONF = YES
TOR_CONF_OPTS = \
--disable-gcc-hardening \
@@ -64,8 +63,12 @@ endif
TOR_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-TOR_CONF_ENV += LIBS=-latomic
+TOR_LIBS += -latomic
endif
+ifeq ($(BR2_STATIC_LIBS),y)
+TOR_LIBS += -lz
+endif
+TOR_CONF_ENV += LIBS="$(TOR_LIBS)"
define TOR_INSTALL_CONF
$(INSTALL) -D -m 644 $(@D)/src/config/torrc.minimal \
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Buildroot] [PATCH 2/2] package/tor: bump version to 0.4.7.7
2022-04-29 18:37 [Buildroot] [PATCH 1/2] package/tor: add -lz to fix static builds Bernd Kuhls
@ 2022-04-29 18:37 ` Bernd Kuhls
2022-04-30 18:51 ` [Buildroot] [PATCH 1/2] package/tor: add -lz to fix static builds Arnout Vandecappelle
1 sibling, 0 replies; 3+ messages in thread
From: Bernd Kuhls @ 2022-04-29 18:37 UTC (permalink / raw)
To: buildroot
Release notes: https://forum.torproject.net/t/stable-release-0-4-7-7/3108
Added sha256 hash provided by upstream.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tor/tor.hash | 3 ++-
package/tor/tor.mk | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/tor/tor.hash b/package/tor/tor.hash
index 16e01c80a9..8f37dd6219 100644
--- a/package/tor/tor.hash
+++ b/package/tor/tor.hash
@@ -1,3 +1,4 @@
+# From https://dist.torproject.org/tor-0.4.7.7.tar.gz.sha256sum
+sha256 3e131158b52b9435d7e43d1c47ef288b96d005342cc44b8c950bb403851a5b44 tor-0.4.7.7.tar.gz
# Locally computed
-sha256 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c tor-0.4.6.10.tar.gz
sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE
diff --git a/package/tor/tor.mk b/package/tor/tor.mk
index 78a6de66dc..3b470a80d8 100644
--- a/package/tor/tor.mk
+++ b/package/tor/tor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TOR_VERSION = 0.4.6.10
+TOR_VERSION = 0.4.7.7
TOR_SITE = https://dist.torproject.org
TOR_LICENSE = BSD-3-Clause
TOR_LICENSE_FILES = LICENSE
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/tor: add -lz to fix static builds
2022-04-29 18:37 [Buildroot] [PATCH 1/2] package/tor: add -lz to fix static builds Bernd Kuhls
2022-04-29 18:37 ` [Buildroot] [PATCH 2/2] package/tor: bump version to 0.4.7.7 Bernd Kuhls
@ 2022-04-30 18:51 ` Arnout Vandecappelle
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2022-04-30 18:51 UTC (permalink / raw)
To: Bernd Kuhls, buildroot
On 29/04/2022 20:37, Bernd Kuhls wrote:
> In order to remove a patch which needs frequent updates on major version
> bumps and to get rid of autoreconf we just add -lz when creating a static
> build. This make sure that static linking occurs in the right order.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Applied both to master, thanks.
Regards,
Arnout
> ---
> Tested using this defconfig
>
> BR2_PACKAGE_XZ=y
> BR2_PACKAGE_ZSTD=y
> BR2_PACKAGE_TOR=y
>
> andes-nds32 [ 1/45]: OK
> arm-aarch64 [ 2/45]: OK
> bootlin-aarch64-glibc [ 3/45]: OK
> bootlin-arcle-hs38-uclibc [ 4/45]: OK
> bootlin-armv5-uclibc [ 5/45]: OK
> bootlin-armv7-glibc [ 6/45]: OK
> bootlin-armv7m-uclibc [ 7/45]: SKIPPED
> bootlin-armv7-musl [ 8/45]: OK
> bootlin-m68k-5208-uclibc [ 9/45]: SKIPPED
> bootlin-m68k-68040-uclibc [10/45]: OK
> bootlin-microblazeel-uclibc [11/45]: OK
> bootlin-mipsel32r6-glibc [12/45]: OK
> bootlin-mipsel-uclibc [13/45]: OK
> bootlin-nios2-glibc [14/45]: OK
> bootlin-openrisc-uclibc [15/45]: OK
> bootlin-powerpc64le-power8-glibc [16/45]: OK
> bootlin-powerpc-e500mc-uclibc [17/45]: OK
> bootlin-riscv32-glibc [18/45]: OK
> bootlin-riscv64-glibc [19/45]: OK
> bootlin-riscv64-musl [20/45]: OK
> bootlin-sh4-uclibc [21/45]: OK
> bootlin-sparc64-glibc [22/45]: OK
> bootlin-sparc-uclibc [23/45]: OK
> bootlin-x86-64-glibc [24/45]: OK
> bootlin-x86-64-musl [25/45]: OK
> bootlin-x86-64-uclibc [26/45]: OK
> bootlin-xtensa-uclibc [27/45]: OK
> br-arm-basic [28/45]: OK
> br-arm-full-nothread [29/45]: SKIPPED
> br-arm-full-static [30/45]: OK
> br-i386-pentium4-full [31/45]: OK
> br-i386-pentium-mmx-musl [32/45]: OK
> br-mips64-n64-full [33/45]: OK
> br-mips64r6-el-hf-glibc [34/45]: OK
> br-powerpc-603e-basic-cpp [35/45]: OK
> br-powerpc64-power7-glibc [36/45]: OK
> linaro-aarch64-be [37/45]: OK
> linaro-aarch64 [38/45]: OK
> linaro-arm [39/45]: OK
> sourcery-arm-armv4t [40/45]: OK
> sourcery-arm [41/45]: OK
> sourcery-arm-thumb2 [42/45]: OK
> sourcery-mips64 [43/45]: OK
> sourcery-mips [44/45]: OK
> sourcery-nios2 [45/45]: OK
> 45 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
>
> ...0001-Fix-static-linking-with-OpenSSL.patch | 94 -------------------
> package/tor/tor.mk | 7 +-
> 2 files changed, 5 insertions(+), 96 deletions(-)
> delete mode 100644 package/tor/0001-Fix-static-linking-with-OpenSSL.patch
>
> diff --git a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
> deleted file mode 100644
> index 26ed6fe819..0000000000
> --- a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
> +++ /dev/null
> @@ -1,94 +0,0 @@
> -From ba6b8ee5b6dee19493a150c3715b0e202440d206 Mon Sep 17 00:00:00 2001
> -From: Bernd Kuhls <bernd.kuhls@t-online.de>
> -Date: Thu, 24 Jan 2019 18:19:51 +0100
> -Subject: [PATCH] Fix static linking with OpenSSL
> -
> -Adjust link order of libz to solve bug with static linking
> -and remove host paths when looking for openssl.
> -
> -[Vincent:
> - - Adapt the patch to make it apply on the new version.]
> -[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10,
> - 0.3.4.8, 0.3.5.7, 0.4.4.5, 0.4.5.6 & 0.4.6.7]
> -[Fabrice: fix detection of openssl functions in 0.3.5.8]
> -Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - configure.ac | 4 ++--
> - src/test/include.am | 8 ++++----
> - src/tools/include.am | 4 ++--
> - 4 files changed, 9 insertions(+), 9 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 05e1392cf..580befa6b 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -1074,7 +1074,7 @@ AC_ARG_WITH(ssl-dir,
> - ])
> -
> - AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
> --TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32],
> -+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32],
> - [#include <openssl/ssl.h>
> - char *getenv(const char *);],
> - [struct ssl_cipher_st;
> -@@ -1104,7 +1104,7 @@ dnl Now check for particular openssl functions.
> - save_LIBS="$LIBS"
> - save_LDFLAGS="$LDFLAGS"
> - save_CPPFLAGS="$CPPFLAGS"
> --LIBS="$TOR_OPENSSL_LIBS $LIBS"
> -+LIBS="$TOR_OPENSSL_LIBS -lz $LIBS"
> - LDFLAGS="$TOR_LDFLAGS_openssl $LDFLAGS"
> - CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS"
> -
> -diff --git a/src/test/include.am b/src/test/include.am
> -index ecb768957..39a622e88 100644
> ---- a/src/test/include.am
> -+++ b/src/test/include.am
> -@@ -399,8 +399,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB)
> - src_test_test_ntor_cl_LDADD = \
> - libtor.a \
> - $(rust_ldadd) \
> -- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
> -- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
> -+ @TOR_LIB_MATH@ \
> -+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
> - @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ @TOR_TRACE_LIBS@
> - src_test_test_ntor_cl_AM_CPPFLAGS = \
> - $(AM_CPPFLAGS)
> -@@ -409,8 +409,8 @@
> - src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB)
> - src_test_test_hs_ntor_cl_LDADD = \
> - libtor.a \
> -- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
> -- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \
> -+ @TOR_LIB_MATH@ \
> -+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \
> - @CURVE25519_LIBS@ @TOR_TRACE_LIBS@
> - src_test_test_hs_ntor_cl_AM_CPPFLAGS = \
> - $(AM_CPPFLAGS)
> -diff --git a/src/tools/include.am b/src/tools/include.am
> -index f7aa7e0d1..4c4e8aa7a 100644
> ---- a/src/tools/include.am
> -+++ b/src/tools/include.am
> -@@ -35,7 +35,7 @@ src_tools_tor_gencert_LDADD = \
> - $(TOR_CRYPTO_LIBS) \
> - $(TOR_UTIL_LIBS) \
> - $(rust_ldadd) \
> -- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \
> -+ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \
> - @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@
> - endif
> -
> -@@ -45,7 +45,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \
> - src/trunnel/libor-trunnel.a \
> - $(TOR_CRYPTO_LIBS) \
> - $(TOR_UTIL_LIBS) \
> -- @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
> -+ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \
> - @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@
> -
> - if USE_NSS
> ---
> -2.20.1
> diff --git a/package/tor/tor.mk b/package/tor/tor.mk
> index d16b3541eb..78a6de66dc 100644
> --- a/package/tor/tor.mk
> +++ b/package/tor/tor.mk
> @@ -11,7 +11,6 @@ TOR_LICENSE_FILES = LICENSE
> TOR_CPE_ID_VENDOR = torproject
> TOR_SELINUX_MODULES = tor
> TOR_DEPENDENCIES = libevent openssl zlib
> -TOR_AUTORECONF = YES
>
> TOR_CONF_OPTS = \
> --disable-gcc-hardening \
> @@ -64,8 +63,12 @@ endif
> TOR_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
>
> ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
> -TOR_CONF_ENV += LIBS=-latomic
> +TOR_LIBS += -latomic
> endif
> +ifeq ($(BR2_STATIC_LIBS),y)
> +TOR_LIBS += -lz
> +endif
> +TOR_CONF_ENV += LIBS="$(TOR_LIBS)"
>
> define TOR_INSTALL_CONF
> $(INSTALL) -D -m 644 $(@D)/src/config/torrc.minimal \
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-30 18:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-29 18:37 [Buildroot] [PATCH 1/2] package/tor: add -lz to fix static builds Bernd Kuhls
2022-04-29 18:37 ` [Buildroot] [PATCH 2/2] package/tor: bump version to 0.4.7.7 Bernd Kuhls
2022-04-30 18:51 ` [Buildroot] [PATCH 1/2] package/tor: add -lz to fix static builds Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.