nearly there…

gabriel pettier · gabriel pettier · commit e10167896609 · 2015-08-20T19:20:23.000+02:00
diff --git a/recipes/gnutls/recipe.sh b/recipes/gnutls/recipe.sh
@@ -22,11 +22,14 @@ function build_gnutls() {
 
 	export CPPFLAGS="-I$BUILD_libgmp/build/include $CPPFLAGS -fexceptions -I${ANDROIDNDK}/sources/cxx-stl/stlport/stlport"
 	export LDFLAGS="-L$BUILD_libgmp/build/lib $LDFLAGS \
+			$NDKPLATFORM/usr/lib/libz.so \
+			$BUILD_libgmp/build/lib/libgmp.a \
 			$ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/$TOOLCHAIN_VERSION/libs/$ARCH/libsupc++.a \
 			$ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/$TOOLCHAIN_VERSION/libs/$ARCH/libgnustl_static.a"
 
 	try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_gnutls/build/ --enable-local-libopts --disable-doc --disable-tests
 	try make install
+    	libtool --finish $BUILD_gnutls/build/
 
 	export LDFLAGS=$OLD_LDFLAGS
 	export CPPFLAGS=$OLD_CPPFLAGS
diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh
@@ -40,18 +40,22 @@ function build_task() {
 	push_arm
 
 	export ANDROID_NDK=$ANDROIDNDK
+	export GNUTLS_LIBRARY=$BUILD_gnutls/build/lib/libgnutls.a
+	export GNUTLS_INCLUDE_DIR=$BUILD_gnutls/build/include
 	cmake -DCMAKE_TOOLCHAIN_FILE=android-cmake/android.toolchain.cmake \
 	      -DUUID_INCLUDE_DIR=$BUILD_libuuid/build/include \
 	      -DUUID_LIBRARY=$BUILD_libuuid/build/lib/libuuid.a \
 	      -DCMAKE_CXX_FLAGS=-fPIC \
-	      -DCMAKE_EXE_LINKER_FLAGS=-pie \
+	      -DGNUTLS_LIBRARY=$GNUTLS_LIBRARY \
+	      -DGNUTLS_INCLUDE_DIR=$GNUTLS_INCLUDE_DIR \
+	      -DCMAKE_EXE_LINKER_FLAGS="-pie -L$BUILD_nettle/build/lib/ -lhogweed -lz $(pkg-config --libs nettle) $BUILD_libgmp/build/lib/libgmp.a" \
 	      -DANDROID_NDK=$ANDROIDNDK \
 	      -DCMAKE_BUILD_TYPE=Release \
 	      -DANDROID_ABI="armeabi-v7a with NEON" \
 	      $_src
 	cmake --build .
 
-	try make -j1 .
+	make -j1 .
 	try cp -a $_build/src/{task,calc,lex} $LIBS_PATH
 
 	pop_arm
