fix task compilation and linking!

gabriel pettier · gabriel pettier · commit 2898399acd5c · 2015-08-27T03:19:09.000+02:00
(ugly hack, but it works)
diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh
@@ -10,16 +10,23 @@ function prebuild_nettle() {
 	true
 }
 
+function shouldbuild_nettle() {
+	if [ -e "$LIBS_PATH/libhogweed.so" ]; then
+		DO_BUILD=0
+	fi
+}
+
 function build_nettle() {
 	cd $BUILD_nettle
 	push_arm
 	OLD_LDFLAGS=$LDFLAGS
 	OLD_CPPFLAGS=$CPPFLAGS
 	export LDFLAGS="-L$BUILD_libgmp/build/lib $LDFLAGS"
-	export CPPFLAGS="-I$BUILD_libgmp/build/include $CPPFLAGS"
+	export CPPFLAGS="-I$BUILD_libgmp/build/include"
 	try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_nettle/build/
 	try make install
     	libtool --finish $BUILD_nettle/build/
+	try cp -L $BUILD_nettle/build/lib/*.so* $LIBS_PATH
 	export LDFLAGS=$OLD_LDFLAGS
 	export CPPFLAGS=$OLD_CPPFLAGS
 	pop_arm
diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh
@@ -3,7 +3,7 @@
 VERSION_task=${VERSION_task:-2.4.4}
 URL_task=http://taskwarrior.org/download/task-${VERSION_task}.tar.gz
 
-DEPS_task=(libuuid gnutls)  # gnutls
+DEPS_task=(libuuid gnutls)
 sha1_task=e7e1336ed099f672b3d5971d6a221b72ed804ac6
 BUILD_task=$BUILD_PATH/task/$(get_directory $URL_task)
 RECIPE_task=$RECIPES_PATH/task
@@ -44,11 +44,12 @@ function build_task() {
 	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 \
+	      -DUUID_LIBRARY=$BUILD_libgmp/build/lib/libgmp.a \
+	      -DTASK_LIBRARIES=$BUILD_libuuid/build/lib/libuuid.a \
 	      -DCMAKE_CXX_FLAGS=-fPIC \
-	      -DGNUTLS_LIBRARY=$GNUTLS_LIBRARY \
+	      -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" \
+	      -DCMAKE_EXE_LINKER_FLAGS="-pie -L$BUILD_nettle/build/lib/ -lhogweed -lz $(pkg-config --libs nettle)" \
 	      -DANDROID_NDK=$ANDROIDNDK \
 	      -DCMAKE_BUILD_TYPE=Release \
 	      -DANDROID_ABI="armeabi-v7a with NEON" \
