commit: daf83c629c3235aa49c7ff3852ebed6df4e5f94b Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed May 17 20:55:15 2017 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed May 17 21:28:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf83c62
dev-libs/libmemcached: fix build failure against gcc-7 Acked-by: prometheanfire Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../files/libmemcached-1.0.18-gcc7.patch | 29 ++++++++++++++++++++++ .../libmemcached/libmemcached-1.0.18-r3.ebuild | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dev-libs/libmemcached/files/libmemcached-1.0.18-gcc7.patch b/dev-libs/libmemcached/files/libmemcached-1.0.18-gcc7.patch new file mode 100644 index 00000000000..6bcb23136c4 --- /dev/null +++ b/dev-libs/libmemcached/files/libmemcached-1.0.18-gcc7.patch @@ -0,0 +1,29 @@ +gcc-7 fails the build as: + clients/memflush.cc: In function 'int main(int, char**)': + clients/memflush.cc:42:22: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] + if (opt_servers == false) + ^~~~~ + +opt_servers is declated as 'static char *opt_servers= NULL;' +diff --git a/clients/memflush.cc b/clients/memflush.cc +index 8bd0dbf..7641b88 100644 +--- a/clients/memflush.cc ++++ b/clients/memflush.cc +@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) + { + options_parse(argc, argv); + +- if (opt_servers == false) ++ if (!opt_servers) + { + char *temp; + +@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) + opt_servers= strdup(temp); + } + +- if (opt_servers == false) ++ if (!opt_servers) + { + std::cerr << "No Servers provided" << std::endl; + exit(EXIT_FAILURE); diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild index f57a17ce258..ee91b8ccdf3 100644 --- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild +++ b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,6 +25,7 @@ RDEPEND="${DEPEND}" src_prepare() { epatch "${FILESDIR}/debug-disable-enable-1.0.18.patch" epatch "${FILESDIR}/continuum-1.0.18.patch" + epatch "${FILESDIR}"/${P}-gcc7.patch sed -i '6i CFLAGS = @CFLAGS@' Makefile.am sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4 eautoreconf