]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
package/tor: fix openssl detection for static builds
authorBernd Kuhls <bernd.kuhls@t-online.de>
Tue, 3 Oct 2017 17:30:44 +0000 (19:30 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 17 Oct 2017 08:41:30 +0000 (10:41 +0200)
Fixes
http://autobuild.buildroot.net/results/8e6/8e639ab8912e7d884fd8e6dbb1ca8b49451dd766/

/home/test/autobuild/run/instance-1/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libcrypto.a(c_zlib.o):
In function `zlib_stateful_expand_block':
c_zlib.c:(.text+0x54): undefined reference to `inflate'
/home/test/autobuild/run/instance-1/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libcrypto.a(c_zlib.o):
In function `zlib_stateful_compress_block':
c_zlib.c:(.text+0xd4): undefined reference to `deflate'

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit d2268adf5b9e19fba6094f53e397168c8a4b8abb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/tor/0001-openssl-libz.patch

index c70894eba17f036a46b35be02006cf8fb8014cc8..9d3cf6e124bfdce7e263c94343ff53ca9a8a6183 100644 (file)
@@ -11,7 +11,12 @@ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 diff -uNr tor-0.3.1.7.org/configure.ac tor-0.3.1.7/configure.ac
 --- tor-0.3.1.7.org/configure.ac       2017-09-15 15:34:06.000000000 +0200
 +++ tor-0.3.1.7/configure.ac   2017-09-19 19:40:17.090538467 +0200
-@@ -713,7 +713,7 @@
+@@ -709,11 +709,11 @@
+       fi
+   ])
+-TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
++TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI],
      [#include <openssl/rand.h>],
      [void RAND_add(const void *buf, int num, double entropy);],
      [RAND_add((void*)0,0,0);], [],