summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-03-16 17:34:48 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-03-16 17:35:28 +0800
commit83394d70df1fdadddb7aeebcc9b225bfbd2a462f (patch)
tree0c375e40a3ba8a7126b8a0215dfefb966034e239
parent9656d6728d6e316f22be06f42019891e28353305 (diff)
gnupg-1.4.10: Readd the ARM Thumb patch as debian has no thumb support
-rw-r--r--recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch12
-rw-r--r--recipes/gnupg/gnupg_1.4.10.bb3
2 files changed, 14 insertions, 1 deletions
diff --git a/recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch b/recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch
new file mode 100644
index 0000000000..dd4ec73eca
--- /dev/null
+++ b/recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch
@@ -0,0 +1,12 @@
+--- gnupg/mpi/longlong.h~ 2006-02-14 10:09:55.000000000 +0000
++++ gnupg/mpi/longlong.h 2008-10-27 13:11:09.000000000 +0000
+@@ -181,7 +181,7 @@
+ /***************************************
+ ************** ARM ******************
+ ***************************************/
+-#if defined (__arm__) && W_TYPE_SIZE == 32
++#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__)
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+ __asm__ ("adds %1, %4, %5\n" \
+ "adc %0, %2, %3" \
+
diff --git a/recipes/gnupg/gnupg_1.4.10.bb b/recipes/gnupg/gnupg_1.4.10.bb
index a5fae96342..38af0873fa 100644
--- a/recipes/gnupg/gnupg_1.4.10.bb
+++ b/recipes/gnupg/gnupg_1.4.10.bb
@@ -4,9 +4,10 @@ DEPENDS += "readline"
EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.. ac_cv_sys_symbol_underscore=yes"
# --without-readline do not support fancy command line editing
+SRC_URI += "file://long-long-thumb.patch;patch=1"
SRC_URI[src.md5sum] = "dcf7ed712997888d616e029637bfc303"
SRC_URI[src.sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38"
S = "${WORKDIR}/gnupg-${PV}"
-PR = "r1"
+PR = "r2"