Skip to contentSkip to conversation

package/tor: fix static build with openssl and atomic

PATCH New Fabrice Fontaine 3 participants 3 messages Apr 9, 2019 – Apr 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 .../0001-Fix-static-linking-with-OpenSSL.patch   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
package/tor/0001-Fix-static-linking-with-OpenSSL.patch +15 -1
index 50ea00af7a..e4cd24e138 100644
@@ -15,11 +15,25 @@ Signed-off-by: Vicente Olivert Riera <[email protected]>
 Signed-off-by: Bernd Kuhls <[email protected]>
 Signed-off-by: Fabrice Fontaine <[email protected]>
 ---
+ 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
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/tor: fix static build with openssl and atomic

Quoted 10 lines · On Tue, 9 Apr 2019 23:06:52 +0200 Fabrice Fontaine…

Update patch so -latomic (provided in LIBS) is added after openssl libs (provided in $3)

Fixes:
- http://autobuild.buildroot.org/results/4b90b7d02e354ebf3d8f95023547bf4a18e0165e

---
 .../0001-Fix-static-linking-with-OpenSSL.patch   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

Applied to master, thanks. Ah, pkg-config would be nicer :-)

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/tor: fix static build with openssl and atomic

In reply to Fabrice Fontaine
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Update patch so -latomic (provided in LIBS) is added after openssl libs (provided in $3)

Fixes:
- http://autobuild.buildroot.org/results/4b90b7d02e354ebf3d8f95023547bf4a18e0165e

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard