diff options
| author | Nishanth Aravamudan <nish.aravamudan@canonical.com> | 2016-10-05 20:00:51 (GMT) |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-10-05 22:44:22 (GMT) |
| commit | 58647b048662bbe58ddc162dbbf8c4fdddbb10c0 (patch) | |
| tree | c27fa11b3626c735752f91f6eeee6ba162316abb | |
| parent | b76a810d228b76d653b926d112174b647fb20f2f (diff) | |
Import version 1.4.25-2ubuntu2 to ubuntu/yakkety-proposedimport/1.4.25-2ubuntu2ubuntu/yakkety-proposedubuntu/devel
Imported using usd-importer.
New changelog entries:
* debian/patches/always_enable_alignment.patch: Force alignment on in
configure.ac. Closes LP: #1630742.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/always_enable_alignment.patch | 57 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 65 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 0f4ee10..a8a528c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +memcached (1.4.25-2ubuntu2) yakkety; urgency=medium + + * debian/patches/always_enable_alignment.patch: Force alignment on in + configure.ac. Closes LP: #1630742. + + -- Nishanth Aravamudan <nish.aravamudan@canonical.com> Wed, 05 Oct 2016 13:00:51 -0700 + memcached (1.4.25-2ubuntu1) xenial; urgency=medium * Merge from Debian unstable (LP: #1556304). Remaining changes: diff --git a/debian/patches/always_enable_alignment.patch b/debian/patches/always_enable_alignment.patch new file mode 100644 index 0000000..ea4cc59 --- /dev/null +++ b/debian/patches/always_enable_alignment.patch @@ -0,0 +1,57 @@ +Description: Force alignment on in configure.ac + Fixes FTBFS on arhmf. +Author: Nishanth Aravamudan <nish.aravamudan@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1630742 + +--- memcached-1.4.25.orig/configure.ac ++++ memcached-1.4.25/configure.ac +@@ -478,48 +478,7 @@ AC_CHECK_FUNCS(sigignore) + AC_CHECK_FUNCS(clock_gettime) + AC_CHECK_FUNCS([accept4], [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if support accept4])]) + +-AC_DEFUN([AC_C_ALIGNMENT], +-[AC_CACHE_CHECK(for alignment, ac_cv_c_alignment, +-[ +- AC_RUN_IFELSE( +- [AC_LANG_PROGRAM([ +-#include <stdlib.h> +-#include <inttypes.h> +- ], [ +- char *buf = malloc(32); +- +- uint64_t *ptr = (uint64_t*)(buf+2); +- // catch sigbus, etc. +- *ptr = 0x1; +- +- // catch unaligned word access (ARM cpus) +-#ifdef ENDIAN_BIG +-#define ALIGNMENT 0x02030405 +-#else +-#define ALIGNMENT 0x05040302 +-#endif +- *(buf + 0) = 1; +- *(buf + 1) = 2; +- *(buf + 2) = 3; +- *(buf + 3) = 4; +- *(buf + 4) = 5; +- int* i = (int*)(buf+1); +- return (ALIGNMENT == *i) ? 0 : 1; +- ]) +- ],[ +- ac_cv_c_alignment=none +- ],[ +- ac_cv_c_alignment=need +- ],[ +- ac_cv_c_alignment=need +- ]) +-]) +-if test $ac_cv_c_alignment = need; then +- AC_DEFINE(NEED_ALIGN, 1, [Machine need alignment]) +-fi +-]) +- +-AC_C_ALIGNMENT ++AC_DEFINE(NEED_ALIGN, 1, [Machine need alignment]) + + dnl Check for our specific usage of GCC atomics. + dnl These were added in 4.1.2, but 32bit OS's may lack shorts and 4.1.2 diff --git a/debian/patches/series b/debian/patches/series index e0f3b8c..4595e7f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 07_disable_tests.patch 08_disable_slabs_test.patch fix-distribution.patch +always_enable_alignment.patch |