[boinc-app-seti] 01/04: Fixing armel ftbfs, upload to experimental

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to annotated tag debian/7.19_svn2051-1
in repository boinc-app-seti.

commit c8407abf3e7c14f43756111ff7884b401761c232
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Feb 15 17:35:26 2014 +0100

    Fixing armel ftbfs, upload to experimental
---
 debian/changelog               | 19 ++++++++++++++++
 debian/patches/fix-armel.patch | 11 +++++++++
 debian/patches/fix-armhf.patch | 51 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  4 +++-
 4 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 98a76ca..ed83386 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+boinc-app-seti (7.19~svn2050-3) experimental; urgency=low
+
+  * Uploading to experimental, fixing armel and armhf ftbfs.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 15 Feb 2014 17:34:43 +0100
+
+boinc-app-seti (7.19~svn2050-2.is.7.00~svn1933-2) unstable; urgency=low
+
+  * Re added autotools-dev as build-dep, fixing arm64 ftbfs
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 30 Dec 2013 23:04:20 +0100
+
+boinc-app-seti (7.19~svn2050-2.is.7.00~svn1933-1) unstable; urgency=low
+
+  * Tweak debian/rules, forcing 7.00 as version
+  * Rebuild 1933 against new boinc_7.2.33+dfsg-1 (Closes: #733204)
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sun, 29 Dec 2013 17:09:45 +0100
+
 boinc-app-seti (7.19~svn2050-1) unstable; urgency=low
 
   * New upstream snapshot.
diff --git a/debian/patches/fix-armel.patch b/debian/patches/fix-armel.patch
new file mode 100644
index 0000000..719b64c
--- /dev/null
+++ b/debian/patches/fix-armel.patch
@@ -0,0 +1,11 @@
+--- boinc-app-seti-7.19~svn2050.orig/configure.ac
++++ boinc-app-seti-7.19~svn2050/configure.ac
+@@ -454,7 +454,7 @@ AC_ARG_WITH([float-abi],
+                     FP_ABI_FLAGS="-mfloat-abi=hard"
+                     ;;
+             arm-*-armel|arm-*-androideabi|arm-*-gnueabi)
+-                    FP_ABI_FLAGS="-mfloat-abi=softfp"
++                    FP_ABI_FLAGS="-mfloat-abi=soft"
+                     ;;
+             *)      FP_ABI_FLAGS=
+                     ;;
diff --git a/debian/patches/fix-armhf.patch b/debian/patches/fix-armhf.patch
new file mode 100644
index 0000000..afc37b2
--- /dev/null
+++ b/debian/patches/fix-armhf.patch
@@ -0,0 +1,51 @@
+Author: Jacky Man <jackyman38 at gmail.com>
+Description: (quoting the mail)
+Basically, the original assembly code for analyzeFuncs_neon.S and analyzeFuncs_vfp.S is writen for soft-float call convention. Since ARM has changed the way the function call with vfp, you will get a compilation error like the following if you don't modify the code.
+
+/usr/bin/ld: error: seti_boinc uses VFP register arguments, analyzeFuncs_neon.o does not
+/usr/bin/ld: failed to merge target specific data of file analyzeFuncs_neon.o
+/usr/bin/ld: error: seti_boinc uses VFP register arguments, analyzeFuncs_vfp.o does not
+/usr/bin/ld: failed to merge target specific data of file analyzeFuncs_vfp.o
+collect2: error: ld returned 1 exit status
+make[2]: *** [seti_boinc] Error 1
+
+May be I should talk to Eric about making the changes in the main tree with #ifdef _armhf_ or somthing like that. meanwhile if you come across the compilation error above, you have the solution.
+
+--- boinc-app-seti-7.19~svn2050.orig/client/vector/analyzeFuncs_neon.S
++++ boinc-app-seti-7.19~svn2050/client/vector/analyzeFuncs_neon.S
+@@ -41,8 +41,16 @@
+  * Author: Mateusz Szpakowski
+  */
+  
++#if defined(__VFP_FP__) && !defined(__SOFTFP__)
++                .syntax unified
++#endif
+                 .arch armv7-a
+                 .fpu neon
++#if defined(__VFP_FP__) && !defined(__SOFTFP__)
++                .eabi_attribute 27, 3
++                .eabi_attribute 28, 1
++#endif
++
+                 .eabi_attribute 20, 1
+                 .eabi_attribute 21, 1
+                 .eabi_attribute 23, 3
+--- boinc-app-seti-7.19~svn2050.orig/client/vector/analyzeFuncs_vfp.S
++++ boinc-app-seti-7.19~svn2050/client/vector/analyzeFuncs_vfp.S
+@@ -41,8 +41,16 @@
+  * Author: Mateusz Szpakowski
+  */
+  
++#if defined(__VFP_FP__) && !defined(__SOFTFP__)
++                .syntax unified
++#endif
+                 .arch armv6
+                 .fpu vfp
++#if defined(__VFP_FP__) && !defined(__SOFTFP__)
++                .eabi_attribute 27, 3
++                .eabi_attribute 28, 1
++#endif
++
+                 .eabi_attribute 20, 1
+                 .eabi_attribute 21, 1
+                 .eabi_attribute 23, 3
diff --git a/debian/patches/series b/debian/patches/series
index e6d31e7..d8806e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,5 +10,7 @@ disable_avx_in_configure.patch
 #005_powerpc_altivec.patch
 006_omitting_archs.patch
 007_worker_comments.patch
-addressing-autosetup-warnings.patch
+#addressing-autosetup-warnings.patch
 fix-ftbfs-arm64.patch
+fix-armel.patch
+fix-armhf.patch

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