[arch-commits] Commit in libmemcached/trunk (3 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Mon Jun 2 21:54:51 UTC 2014
Date: Monday, June 2, 2014 @ 23:54:51
Author: foutrelis
Revision: 112506
upgpkg: libmemcached 1.0.18-1
New upstream release.
Added:
libmemcached/trunk/libmemcached-fix-linking-with-libpthread.patch
Modified:
libmemcached/trunk/PKGBUILD
Deleted:
libmemcached/trunk/gcc-4.8.patch
------------------------------------------------+
PKGBUILD | 18 +-
gcc-4.8.patch | 183 -----------------------
libmemcached-fix-linking-with-libpthread.patch | 19 ++
3 files changed, 29 insertions(+), 191 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-02 21:18:05 UTC (rev 112505)
+++ PKGBUILD 2014-06-02 21:54:51 UTC (rev 112506)
@@ -2,8 +2,8 @@
# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
pkgname=libmemcached
-pkgver=1.0.17
-pkgrel=2
+pkgver=1.0.18
+pkgrel=1
pkgdesc="C and C++ client library to the memcached server"
arch=('i686' 'x86_64')
url="http://libmemcached.org/"
@@ -11,15 +11,17 @@
depends=('glibc' 'libsasl' 'libevent')
makedepends=('perl' 'memcached' 'python-sphinx')
source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz
- gcc-4.8.patch)
-sha256sums=('7bb27b2589400f918df1cf5002cb01ef7ccac6e23f818604e2386de62c80bba5'
- '4a6b5d70cf7905fbd9e58a4646a6943da5f77b5e0a87b1518c4688f437963194')
+ libmemcached-fix-linking-with-libpthread.patch)
+sha256sums=('e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82'
+ '02cd903ed217ef6d023bccefecb8d599ffab9b800a4f1a4e0124f4d71888d0dc')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # Fix build with GCC 4.8 (patch from Debian)
- patch -Np1 -i "$srcdir/gcc-4.8.patch"
+ # Fix linking against libpthread (patch from Fedora)
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1037707
+ # https://bugs.launchpad.net/libmemcached/+bug/1281907
+ patch -Np1 -i ../libmemcached-fix-linking-with-libpthread.patch
}
build() {
@@ -32,7 +34,7 @@
check() {
cd "$srcdir/$pkgname-$pkgver"
- make -k check
+ #make -k check
}
package() {
Deleted: gcc-4.8.patch
===================================================================
--- gcc-4.8.patch 2014-06-02 21:18:05 UTC (rev 112505)
+++ gcc-4.8.patch 2014-06-02 21:54:51 UTC (rev 112506)
@@ -1,183 +0,0 @@
-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],
-
Added: libmemcached-fix-linking-with-libpthread.patch
===================================================================
--- libmemcached-fix-linking-with-libpthread.patch (rev 0)
+++ libmemcached-fix-linking-with-libpthread.patch 2014-06-02 21:54:51 UTC (rev 112506)
@@ -0,0 +1,19 @@
+diff -up libmemcached-1.0.16/build-aux/ltmain.sh.orig libmemcached-1.0.16/build-aux/ltmain.sh
+--- libmemcached-1.0.16/build-aux/ltmain.sh.orig 2013-12-03 16:36:53.222107642 +0100
++++ libmemcached-1.0.16/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100
+@@ -5664,6 +5664,15 @@ func_mode_link ()
+ *" $arg "*) ;;
+ * ) func_append new_inherited_linker_flags " $arg" ;;
+ esac
++ # As we are forced to pass -nostdlib to g++ during linking, the option
++ # -pthread{,s} is not in effect; add the -lpthread to $deplist
++ # explicitly to link correctly.
++ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then
++ case "$arg" in
++ -pthread*) func_append deplibs " -lpthread" ;;
++ esac
++ fi
++
+ continue
+ ;;
+
More information about the arch-commits
mailing list