fixes to nettle build

gabriel pettier · gabriel pettier · commit 6cf6f0c860cc · 2015-10-11T20:56:56.000+02:00
diff --git a/recipes/nettle/configure.patch b/recipes/nettle/configure.patch
@@ -0,0 +1,21 @@
+--- a/configure 2015-10-02 21:38:50.590177998 +0200
++++ b/configure	015-10-02 21:34:31.647035677 +0200
+@@ -5027,14 +5027,14 @@
+     ;;
+   *)
+     LIBNETTLE_FORLINK=libnettle.so
+-    LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)'
+-    LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)'
++    LIBNETTLE_SONAME='libnettle.$(LIBNETTLE_MAJOR)'.so
++    LIBNETTLE_FILE='libnettle.$(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR)'.so
+     LIBNETTLE_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$(LIBNETTLE_SONAME)'
+     LIBNETTLE_LIBS=''
+ 
+     LIBHOGWEED_FORLINK=libhogweed.so
+-    LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
+-    LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
++    LIBHOGWEED_SONAME='libhogweed.$(LIBHOGWEED_MAJOR)'.so
++    LIBHOGWEED_FILE='libhogweed.$(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)'.so
+     LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -Wl,-soname=$(LIBHOGWEED_SONAME)'
+     # Requested by debian, to make linking with only -lhogweed work
+     # (does not work in general, e.g., with static linking all of
diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh
@@ -6,7 +6,11 @@ DEPS_nettle=(libgmp)
 BUILD_nettle=$BUILD_PATH/nettle/$(get_directory $URL_nettle)
 RECIPE_nettle=$RECIPES_PATH/nettle
 
+_src=$BUILD_nettle
+
 function prebuild_nettle() {
+	cd $_src
+	try patch -p1 < $RECIPE_nettle/configure.patch
 	true
 }
 
diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh
@@ -8,19 +8,18 @@ sha1_task=e7e1336ed099f672b3d5971d6a221b72ed804ac6
 BUILD_task=$BUILD_PATH/task/$(get_directory $URL_task)
 RECIPE_task=$RECIPES_PATH/task
 
-_src=$BUILD_task
 _build=$BUILD_task/build_p4a
 _pyroot=$(dirname `dirname $HOSTPYTHON`)
 
 function prebuild_task() {
 	# take the patch from the recipe
-	cd $_src
+	cd $BUILD_task
 	patch -p1 < $RECIPE_task/CMakeLists.txt.patch
 	patch -p1 < $RECIPE_task/Nibbler.h.patch
 
-	cp $RECIPE_task/glob.* $_src/src
+	cp $RECIPE_task/glob.* $BUILD_task/src
 
-	cd $_build
+	cd $BUILD_task/build_p4a
 	if [ ! -d android-cmake ]
 	then
 		git clone https://github.com/taka-no-me/android-cmake.git
@@ -33,9 +32,8 @@ function prebuild_task() {
 #}
 
 function build_task() {
-
-	try mkdir -p $_build
-	cd $_build
+	try mkdir -p $BUILD_task/build_p4a
+	cd $BUILD_task/build_p4a
 
 	push_arm
 
@@ -49,15 +47,16 @@ function build_task() {
 	      -DCMAKE_CXX_FLAGS=-fPIC \
 	      -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)" \
+	      -DCMAKE_EXE_LINKER_FLAGS="-pie $(pkg-config --libs nettle hogweed) -lz" \
 	      -DANDROID_NDK=$ANDROIDNDK \
 	      -DCMAKE_BUILD_TYPE=Release \
+	      -DCMAKE_VERBOSE_MAKEFILE=ON \
 	      -DANDROID_ABI="armeabi-v7a with NEON" \
-	      $_src
+	      $BUILD_task
 	cmake --build .
 
 	make -j1 .
-	try cp -a $_build/src/{task,calc,lex} $LIBS_PATH
+	try cp -a $BUILD_task/build_p4a/src/{task,calc,lex} $LIBS_PATH
 
 	pop_arm
 }
