From 1b538790ac435f4fd41e91e9c8c7e73a4948f652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Mon, 29 Jun 2020 11:39:23 -0400 Subject: [PATCH] build: link libarchive before Nettle libarchive depends on Nettle Change-Id: Id2e5e0a9e53c962ab82b998d9512f1cb97b73fc6 --- build-daemon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-daemon.sh b/build-daemon.sh index 5d27d4307..6e4ffd9fb 100755 --- a/build-daemon.sh +++ b/build-daemon.sh @@ -203,6 +203,7 @@ STATIC_LIBS_ALL="-llog -lOpenSLES -landroid \ -lpjlib-util-${PJ_TARGET_TUPLE} \ -lpj-${PJ_TARGET_TUPLE} \ -lupnp -lixml \ + -larchive \ -lsecp256k1 \ -lgnutls -lhogweed -lnettle -lgmp \ -lssl -lcrypto \ @@ -211,8 +212,7 @@ STATIC_LIBS_ALL="-llog -lOpenSLES -landroid \ -luuid -lz -ldl \ -lvpx -lopus -lspeex -lspeexdsp -lx264 \ -largon2 \ - -liconv \ - -larchive" + -liconv" LIBRING_JNI_DIR=${ANDROID_APP_DIR}/app/src/main/libs/${ANDROID_ABI} -- GitLab