[boinc-app-seti] 01/01: Add arm64 patch fix
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Tue Apr 11 12:26:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository boinc-app-seti.
commit 1dc121afd9d03fd4ed0abdab64574ecd940c3a47
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Apr 11 14:25:14 2017 +0200
Add arm64 patch fix
---
debian/changelog | 7 +++++++
debian/patches/fix-arm-build.patch | 21 ---------------------
debian/patches/fix-arm64.patch | 14 ++++++++++++++
debian/patches/series | 2 +-
debian/rules | 2 +-
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b4b333b..6fc7d91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc-app-seti (8.00~svn3643-1~exp4) UNRELEASED; urgency=medium
+
+ * Bump compat level to 10.
+ * Try to fix arm64 build.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 11 Apr 2017 14:24:24 +0200
+
boinc-app-seti (8.00~svn3643-1~exp3) experimental; urgency=medium
* Introduced LTO (Link Time Optimization).
diff --git a/debian/patches/fix-arm-build.patch b/debian/patches/fix-arm-build.patch
deleted file mode 100644
index ea7a9cf..0000000
--- a/debian/patches/fix-arm-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: fix an armhf build failure, by reverting the pld function removal.
-../../client/vector/analyzeFuncs_vfp_aux.cpp: In function 'void v_pfsubTranspose(float*, float*, int, int)':
-../../client/vector/analyzeFuncs_vfp_aux.cpp:68:24: error: there are no arguments to 'pld' that depend on a template parameter, so a declaration of 'pld' must be available [-fpermissive]
-
---- boinc-app-seti-8.00~svn3363.orig/client/vector/analyzeFuncs_vfp_aux.cpp
-+++ boinc-app-seti-8.00~svn3363/client/vector/analyzeFuncs_vfp_aux.cpp
-@@ -48,6 +48,14 @@
- #include "asmlib.h"
- #include "pulsefind.h"
-
-+inline void pld(void *arg1,const int arg2=0) {
-+ __asm__ __volatile__ (
-+ "pld [%0,%1]\n"
-+ :
-+ : "r" (arg1), "Jr" (arg2)
-+ );
-+}
-+
-
- template <int x>
- inline void v_pfsubTranspose(float *in, float *out, int xline, int yline) {
diff --git a/debian/patches/fix-arm64.patch b/debian/patches/fix-arm64.patch
new file mode 100644
index 0000000..aab3fe5
--- /dev/null
+++ b/debian/patches/fix-arm64.patch
@@ -0,0 +1,14 @@
+Description: Fix arm64 build, pld instruction seems to be not available there.
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+
+--- boinc-app-seti-8.00~svn3643.orig/client/vector/analyzeFuncs_vfp_aux.cpp
++++ boinc-app-seti-8.00~svn3643/client/vector/analyzeFuncs_vfp_aux.cpp
+@@ -33,7 +33,7 @@
+ #include <vector>
+ #include <cmath>
+
+-#if defined(__arm__) && defined(__VFP_FP__) && !defined(__SOFTFP__) || defined(__aarch64__)
++#if defined(__arm__) && defined(__VFP_FP__) && !defined(__SOFTFP__)
+
+
+ #define INVALID_CHIRP 2e+20
diff --git a/debian/patches/series b/debian/patches/series
index 5d9a55c..09359aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,6 @@
006_omitting_archs.patch
007_worker_comments.patch
216-fix-build.patch
-#fix-arm-build.patch
isnan-fix.patch
introduce_lto.patch
+fix-arm64.patch
diff --git a/debian/rules b/debian/rules
index cbb998e..08f991b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,7 +126,7 @@ APP_INFO_VERSION = $(subst .,,$(UPSTREAM_VERSION))
%:
- dh $@ --parallel --with autoreconf
+ dh $@
CFGFLAGS = \
--disable-static-client \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc-app-seti.git
More information about the pkg-boinc-commits
mailing list