add libgmp recipe and fixes for nettle and gnutls recipe

gabriel pettier · gabriel pettier · commit 12562ade8e87 · 2015-08-17T02:28:52.000+02:00
diff --git a/recipes/gnutls/recipe.sh b/recipes/gnutls/recipe.sh
@@ -12,10 +12,24 @@ function prebuild_gnutls() {
 
 function build_gnutls() {
 	cd $BUILD_gnutls
-	bash
 	push_arm
-	try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_gnutls/build/lib
+	export PKG_CONFIG_PATH="$BUILD_nettle/build/lib/pkgconfig:$PKG_CONFIG_PATH"
+	OLD_LDFLAGS=$LDFLAGS
+	OLD_CPPFLAGS=$CPPFLAGS
+
+	#echo $SHELL
+	#PS1='\w: ' $SHELL
+
+	export CPPFLAGS="-I$BUILD_libgmp/build/include $CPPFLAGS -fexceptions -I${ANDROIDNDK}/sources/cxx-stl/stlport/stlport"
+	export LDFLAGS="-L$BUILD_libgmp/build/lib $LDFLAGS \
+			$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
+
+	export LDFLAGS=$OLD_LDFLAGS
+	export CPPFLAGS=$OLD_CPPFLAGS
 	pop_arm
 }
 
diff --git a/recipes/libgmp/recipe.sh b/recipes/libgmp/recipe.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+VERSION_libgmp=${VERSION_libgmp:-6.0.0a}
+URL_libgmp=https://gmplib.org/download/gmp/gmp-${VERSION_libgmp}.tar.xz
+DEPS_libgmp=()
+BUILD_libgmp=$BUILD_PATH/libgmp/$(get_directory $URL_libgmp)
+RECIPE_libgmp=$RECIPES_PATH/libgmp
+
+function prebuild_libgmp() {
+    true
+}
+
+function shouldbuild_libgmp() {
+    true
+}
+
+function build_libgmp() {
+    cd $BUILD_libgmp
+
+    push_arm
+    try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_libgmp/build/
+    #try make check
+    try make install
+    libtool --finish $BUILD_libgmp/build/
+    pop_arm
+}
+
+function postbuild_libgmp() {
+    true
+}
diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh
@@ -2,6 +2,7 @@
 
 VERSION_nettle=2.7.1
 URL_nettle=https://ftp.gnu.org/gnu/nettle/nettle-${VERSION_nettle}.tar.gz
+DEPS_nettle=(libgmp)
 BUILD_nettle=$BUILD_PATH/nettle/$(get_directory $URL_nettle)
 RECIPE_nettle=$RECIPES_PATH/nettle
 
@@ -12,9 +13,15 @@ function prebuild_nettle() {
 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"
 	try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_nettle/build/
 	try make install
     	libtool --finish $BUILD_nettle/build/
+	export LDFLAGS=$OLD_LDFLAGS
+	export CPPFLAGS=$OLD_CPPFLAGS
 	pop_arm
 }
 
