[arch-commits] Commit in libmemcached/trunk (PKGBUILD gcc-4.8.patch)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Sat Jun 22 07:02:09 UTC 2013
Date: Saturday, June 22, 2013 @ 09:02:09
Author: foutrelis
Revision: 93007
upgpkg: libmemcached 1.0.17-1
New upstream release.
Added:
libmemcached/trunk/gcc-4.8.patch
Modified:
libmemcached/trunk/PKGBUILD
---------------+
PKGBUILD | 17 +++--
gcc-4.8.patch | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 196 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-22 06:09:35 UTC (rev 93006)
+++ PKGBUILD 2013-06-22 07:02:09 UTC (rev 93007)
@@ -2,8 +2,8 @@
# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
pkgname=libmemcached
-pkgver=1.0.16
-pkgrel=2
+pkgver=1.0.17
+pkgrel=1
pkgdesc="C and C++ client library to the memcached server"
arch=('i686' 'x86_64')
url="http://libmemcached.org/"
@@ -11,9 +11,18 @@
depends=('glibc' 'libsasl' 'libevent')
makedepends=('perl' 'memcached' 'python-sphinx')
options=('!libtool')
-source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('2215d1766bff02b75403291d3d870fcd7d0735e4d018657d4d74fc44e92bdbfc')
+source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz
+ gcc-4.8.patch)
+sha256sums=('7bb27b2589400f918df1cf5002cb01ef7ccac6e23f818604e2386de62c80bba5'
+ '4a6b5d70cf7905fbd9e58a4646a6943da5f77b5e0a87b1518c4688f437963194')
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Fix build with GCC 4.8 (patch from Debian)
+ patch -Np1 -i "$srcdir/gcc-4.8.patch"
+}
+
build() {
cd "$srcdir/$pkgname-$pkgver"
Added: gcc-4.8.patch
===================================================================
--- gcc-4.8.patch (rev 0)
+++ gcc-4.8.patch 2013-06-22 07:02:09 UTC (rev 93007)
@@ -0,0 +1,183 @@
+Description: Fix compilation with gcc-4.8
+ This patch fixes the error flags made incompatible with gcc-4.8:
+ g++: error: -fsanitize=address is incompatible with -fsanitize=thread
+Author: Brian Aker
+Last-Update: 2013-06-14
+Bug: https://bugs.launchpad.net/libmemcached/+bug/1164442
+
+--- a/libtest/run.gdb 2012-03-26 01:08:09 +0000
++++ b/libtest/run.gdb 2013-04-10 05:25:24 +0000
+@@ -1,5 +1,6 @@
+ set logging on
+ set logging overwrite on
+ set environment LIBTEST_IN_GDB=1
++set ASAN_OPTIONS=abort_on_error=1
+ run
+ thread apply all bt
+
+--- a/m4/ax_harden_compiler_flags.m4 2013-02-12 05:44:21 +0000
++++ b/m4/ax_harden_compiler_flags.m4 2013-04-10 05:25:24 +0000
+@@ -53,7 +53,7 @@
+ # ? _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) -- Don't turn on for
+ # compatibility issues memcached_stat_st
+
+-#serial 8
++#serial 9
+
+ AC_DEFUN([_WARNINGS_AS_ERRORS],
+ [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
+@@ -92,9 +92,12 @@
+ _APPEND_COMPILE_FLAGS_ERROR([-H])
+ _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
+ _APPEND_COMPILE_FLAGS_ERROR([-g])
+- _APPEND_COMPILE_FLAGS_ERROR([-O0])],
+- [_APPEND_COMPILE_FLAGS_ERROR([-g])
+- _APPEND_COMPILE_FLAGS_ERROR([-O2])])
++ _APPEND_COMPILE_FLAGS_ERROR([-O0]),
++ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
++ ],[
++ _APPEND_COMPILE_FLAGS_ERROR([-g])
++ _APPEND_COMPILE_FLAGS_ERROR([-O2])
++ ])
+
+ AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
+ [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
+@@ -155,26 +158,31 @@
+ _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
+ _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
+ _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
++ AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
++ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
++ AS_IF([test "x$enable_shared" = "xyes"],[
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
++ ])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
++ ])
+ _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
+ _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
+ _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
+@@ -186,6 +194,7 @@
+ _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
+ _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
+ _APPEND_COMPILE_FLAGS_ERROR([-pipe])
++ _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
+
+ AS_IF([test "x$ax_enable_debug" = xno],
+ [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
+@@ -213,9 +222,12 @@
+ _APPEND_COMPILE_FLAGS_ERROR([-H])
+ _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
+ _APPEND_COMPILE_FLAGS_ERROR([-g])
+- _APPEND_COMPILE_FLAGS_ERROR([-O0])],
+- [_APPEND_COMPILE_FLAGS_ERROR([-g])
+- _APPEND_COMPILE_FLAGS_ERROR([-O2])])
++ _APPEND_COMPILE_FLAGS_ERROR([-O0]),
++ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
++ ],[
++ _APPEND_COMPILE_FLAGS_ERROR([-g])
++ _APPEND_COMPILE_FLAGS_ERROR([-O2])
++ ])
+
+ AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
+ [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
+@@ -268,27 +280,32 @@
+ _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
+ _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
+ # _APPEND_COMPILE_FLAGS_ERROR([-Weffc++])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
+- _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
+-# _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
++ AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
++ _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
++ AS_IF([test "x$enable_shared" = "xyes"],[
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
++ ])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
++ _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
++ ])
++# _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
+ _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
+ _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
+ _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
+@@ -301,6 +318,7 @@
+ _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
+ _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
+ _APPEND_COMPILE_FLAGS_ERROR([-pipe])
++ _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
+
+ AS_IF([test "x$ax_enable_debug" = xno],
+ [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
+
More information about the arch-commits
mailing list