[boinc-app-seti] 02/04: Imported Upstream version 7.09~svn1982

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc-app-seti.

commit 7cb3884c4e048b2582cdf9c083ee71f9f40791ef
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Sep 6 12:09:17 2013 +0200

    Imported Upstream version 7.09~svn1982
---
 Makefile.incl           |    2 +-
 build_android_client.sh |   10 +++++-----
 configure.ac            |   41 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/Makefile.incl b/Makefile.incl
index 62cc811..64d4296 100644
--- a/Makefile.incl
+++ b/Makefile.incl
@@ -30,7 +30,7 @@ INFORMIX_LIBS = @INFORMIX_LIBS@
 INFORMIX_CFLAGS = @INFORMIX_CFLAGS@
 APP_LIBS = @ASMLIB_LIBS@ @APP_LIBS@
 APP_LDFLAGS = @ASMLIB_LDFLAGS@ @APP_LDFLAGS@
-APP_CFLAGS = @ASMLIB_CFLAGS@ @APP_CFLAGS@
+APP_CFLAGS = @ASMLIB_CFLAGS@ @APP_CFLAGS@ @FP_ABI_FLAGS@ @FP_FLAGS@
 GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@
 DEFS = @DEFS@
 GRAPHICS_LIBS = @GRAPHICS_LIBS@
diff --git a/build_android_client.sh b/build_android_client.sh
index cc7f245..cfae449 100755
--- a/build_android_client.sh
+++ b/build_android_client.sh
@@ -35,11 +35,11 @@ export AR=${CROSS_PREFIX}-ar
 export STRIP=${CROSS_PREFIX}-strip
 export RANLIB=${CROSS_PREFIX}-ranlib
 
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -O3 -fomit-frame-pointer -mfloat-abi=softfp -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer -mfloat-abi=softfp -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -O3 -fomit-frame-pointer -march=armv6 -mtune=cortex-a9"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer -march=armv6 -mtune=cortex-a9"
 export CCASFLAGS="${CFLAGS}"
-export LDFLAGS="-L$TCINCLUDES/lib/armv7-a -L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -lstdc++"
-export LIBS="/usr/arm-linux-androideabi/arm-linux-androideabi/lib/armv7-a/libstdc++.a"
+export LDFLAGS="-L$TCINCLUDES/lib/armv6 -L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -lstdc++"
+export LIBS="/usr/arm-linux-androideabi/arm-linux-androideabi/lib/libstdc++.a"
 export PKG_CONFIG_SYSROOT_DIR=$TCSYSROOT
 export PKG_CONFIG_PATH=$CURL_DIR/lib/pkgconfig:$OPENSSL_DIR/lib/pkgconfig
 
@@ -49,7 +49,7 @@ if [ -n "$MAKECLEAN" ]; then
 make clean
 fi
 if [ -n "$CONFIGURE" ]; then
-./_autosetup
+./_autosetup 
 ./configure -C --host=${ac_cv_host} --prefix="${ANDROIDTC}/arm-linux-androideabi" --exec-prefix="${ANDROIDTC}/arm-linux-androideabi" --with-boinc-platform="arm-android-linux-gnu" --with-ssl=$TCINCLUDES --disable-graphics --disable-server 
 fi
 make
diff --git a/configure.ac b/configure.ac
index 8b565b7..665f351 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 
 
 AC_PREREQ(2.57)
-AC_INIT(setiathome_v7, 7.07, korpela at ssl.berkeley.edu)
+AC_INIT(setiathome_v7, 7.09, korpela at ssl.berkeley.edu)
 AC_CONFIG_MACRO_DIR([m4])
 svnrev="`svn info | grep Revision:`"
 
@@ -442,6 +442,45 @@ else
     [Define to the typecast required for arg 2 of _mm256_maskstore_ps()])
 fi
 
+AC_ARG_WITH([float-abi],
+    AC_HELP_STRING([--with-float-abi=<abi>],
+                   [set -mfloat-abi parameter for gcc]),
+    [FP_ABI_FLAGS="-mfloat-abi=$withval"],[
+    if test "x$FP_ABI_FLAGS" = "x" && ! ( echo ${CFLAGS} ${CPPFLAGS} ${CXXFLAGS} | grep mfloat-abi ) ; then
+        case $host in
+            arm-*-armhf|arm-*-gnueabihf)
+                    FP_ABI_FLAGS="-mfloat-abi=hard"
+                    ;;
+            arm-*-armel|arm-*-androideabi|arm-*-gnueabi)
+                    FP_ABI_FLAGS="-mfloat-abi=softfp"
+                    ;;
+            *)      FP_ABI_FLAGS=
+                    ;;
+        esac
+    fi
+])
+
+AC_ARG_WITH([fpu],
+    AC_HELP_STRING([--with-fpu=<fpu>],
+                   [set -mfpu parameter for gcc]),
+    [FP_FLAGS="-mfpu=$withval"],[
+    if test "x$FP_ABI_FLAGS" != "x-mfloat-abi=soft" && ! ( echo ${CFLAGS} ${CPPFLAGS} ${CXXFLAGS} | grep "mfloat-abi=soft[[ $]]" ) ; then
+        if test "x$FP_FLAGS" = "x" && ! ( echo ${CFLAGS} ${CPPFLAGS} ${CXXFLAGS} | grep mfpu ) ; then
+            case $host in
+                arm-*-armhf|arm-*-armel|arm-*-androideabi)
+                        FP_FLAGS="-mfpu=vfp"
+                        ;;
+                *)      FP_FLAGS=
+                        ;;
+            esac
+        fi
+    fi
+])
+
+
+AC_SUBST([FP_ABI_FLAGS])
+AC_SUBST([FP_FLAGS])
+
 AC_CACHE_SAVE
 
 AH_TOP([

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc-app-seti.git