aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-04-09 23:06:52 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-04-14 23:21:35 +0200
commitbc70d3b66dc70e74378773a33e7a8840bb28087e (patch)
treea45d986dcbcc88ee9a3b471d037d0246618d9872
parent0341ab3a75022fac79f689830861efe8dc535bea (diff)
downloadbuildroot-bc70d3b66dc70e74378773a33e7a8840bb28087e.tar.gz
buildroot-bc70d3b66dc70e74378773a33e7a8840bb28087e.tar.bz2
package/tor: fix static build with openssl and atomic
Update patch so -latomic (provided in LIBS) is added after openssl libs (provided in $3) Fixes: - http://autobuild.buildroot.org/results/4b90b7d02e354ebf3d8f95023547bf4a18e0165e Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 73c04d9448f9172eb2174ed3c891ac2953eff6d5) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/tor/0001-Fix-static-linking-with-OpenSSL.patch16
1 files changed, 15 insertions, 1 deletions
diff --git a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
index 50ea00af7a..e4cd24e138 100644
--- a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
+++ b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
@@ -15,11 +15,25 @@ 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>
---
+ acinclude.m4 | 2 +-
configure.ac | 4 ++--
src/test/include.am | 8 ++++----
src/tools/include.am | 4 ++--
- 3 files changed, 8 insertions(+), 8 deletions(-)
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+diff --git a/acinclude.m4 b/acinclude.m4
+index 5ecdf1d5c..be5633f4f 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -166,7 +166,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [
+
+ for tor_trydir in "$try$1dir" "(system)" "$prefix" /usr/local /usr/pkg $8; do
+ LDFLAGS="$tor_saved_LDFLAGS"
+- LIBS="$tor_saved_LIBS $3"
++ LIBS="$3 $tor_saved_LIBS"
+ CPPFLAGS="$tor_saved_CPPFLAGS"
+
+ if test -z "$tor_trydir" ; then
diff --git a/configure.ac b/configure.ac
index 05e1392cf..580befa6b 100644
--- a/configure.ac