[Pkg-mysql-commits] [mariadb-5.5] 01/01: Add patch to fix HPPA build error (Closes: #751805)

[Otto Kekäläinen]

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

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 33909a3eacadae74d4cdd2d04db05ee256527d82
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Fri Jun 20 22:07:27 2014 +0300

    Add patch to fix HPPA build error (Closes: #751805)
---
 debian/changelog                                   |  4 ++++
 debian/patches/20_fix_hppa_architecture_build.diff | 14 ++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dd9a25b..16fdadf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 mariadb-5.5 (5.5.38-1) unstable; urgency=low
 
   * New upstream release.
+  * Added upstream release signing key in preparation for future use
+  * Made libterm-readkey-perl a depends instead of suggest (Closes: LP#1324082)
+  * Add patch to fix HPPA build error (Closes: #751805)
+  * Fixed lots and lots of Lintian warnings
 
  -- Otto Kekäläinen <otto at seravo.fi>  Tue, 17 Jun 2014 16:24:35 +0300
 
diff --git a/debian/patches/20_fix_hppa_architecture_build.diff b/debian/patches/20_fix_hppa_architecture_build.diff
new file mode 100644
index 0000000..9b8de7d
--- /dev/null
+++ b/debian/patches/20_fix_hppa_architecture_build.diff
@@ -0,0 +1,14 @@
+Author: Helge Deller <deller at gmx.de>
+Description: mariadb-5.5 FTBFS, patch for hppa architecture attached #751805
+
+--- old/storage/xtradb/os/os0stacktrace.c	2014-06-16 16:19:31.288965684 +0200
++++ new/storage/xtradb/os/os0stacktrace.c	2014-06-16 17:16:44.210474810 +0200
+@@ -85,7 +85,7 @@ os_stacktrace_print(
+ 	caller_address = (void*) uc->uc_mcontext.gregs[REG_RIP] ;
+ #elif defined(__hppa__)
+ 	ucontext_t* uc = (ucontext_t*) ucontext;
+-	caller_address = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0×3UL ;
++	caller_address = (void*) (uc->uc_mcontext.sc_iaoq[0] & ~0x3UL);
+ #elif (defined (__ppc__)) || (defined (__powerpc__))
+ 	ucontext_t* uc = (ucontext_t*) ucontext;
+ 	caller_address = (void*) uc->uc_mcontext.regs->nip ;
diff --git a/debian/patches/series b/debian/patches/series
index 73588b7..94b23a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+20_fix_hppa_architecture_build.diff
 33_scripts__mysql_create_system_tables__no_test.diff
 38_scripts__mysqld_safe.sh__signals.diff
 41_scripts__mysql_install_db.sh__no_test.diff

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git