Bug #278780: Any user that passes -DNDEBUG on their own is asking for trouble with the testapp and -debug versions. Ensure that the object files are seperated, and ignore the user for two of the binaries.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 128 insertions, 2 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 6c048dec6369..c631b01d2333 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.94 2009/07/26 12:40:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.95 2009/07/28 01:07:27 robbat2 Exp $
+
+*memcached-1.4.0-r1 (28 Jul 2009)
+
+  28 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +memcached-1.4.0-r1.ebuild,
+  +files/memcached-1.4.0-fix-as-needed-linking.patch:
+  Bug #278780: Any user that passes -DNDEBUG on their own is asking for
+  trouble with the testapp and -debug versions. Ensure that the object files
+  are seperated, and ignore the user for two of the binaries.
 
   26 Jul 2009; Brent Baude <ranger@gentoo.org> memcached-1.2.8.ebuild:
   Marking memcached-1.2.8 ppc64 for bug 268158
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 6c90d2ee0fdb..a5827028fed2 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -15,6 +15,7 @@ AUX init 571 RMD160 ddaa6e2e9464618920cc3b6cb02d7ded1d164bdb SHA1 db92dc23707f26
 AUX memcached-1.2.2-fbsd.patch 328 RMD160 669542854d9cbca5495db2ac2fe280502dbe96e6 SHA1 c783c1f1b89da8f61f170641dcf4d0987b9c3b08 SHA256 a0e91bd63a01a1a3361b0465fb9c63d091627d8714f3f64c853723b31da54b2f
 AUX memcached-1.2.2-p-threads.patch 869 RMD160 1b1673479b543515b67a284bfd38876f235e5fba SHA1 6345377ac93ef302386abae8e7ab9c273a4e3a98 SHA256 be6066ca09d2c871d6f0691cc101684512bf7a16c5e823412ed8a98213048e61
 AUX memcached-1.3.3-gcc4-slab-fixup.patch 1051 RMD160 846caa1cbb5aeb4cb8f976b260d3c8cebf489715 SHA1 bcf25452ab529440a61334be14c8271343c48f87 SHA256 a812ac8711230764408eab9c3379811b7143d799d787d6f1642a45c82967c62d
+AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 RMD160 5178d0f784a72beea18772f15fc2419d475f943b SHA1 84ac2385fee3ad8239a4e3a679d309e760a3bb6e SHA256 bfedf767ee68f83e1e31d78d551d16f644cbfc8d385c991968d6cfdd22946cb8
 DIST memcached-1.1.12.tar.gz 114103 RMD160 4a1914d157cdd0d73102733f32dd835a494585c4 SHA1 431bfc095c777948073e38436c6cf176acb6b5de SHA256 6a8e63b02d8576a937dc154232357dbb9c236890be53e9ce0d44e2dba21ca79a
 DIST memcached-1.1.13.tar.gz 133734 RMD160 57b6da75e45af66f5d2a0c4a7a2a22a256cfb209 SHA1 e646da415434721b124baea10e09c62ce2ba3a56 SHA256 cb46911afde64f627af277b46b879b4a66d0653c22b9e6ccd31392a9a4ebbe5f
 DIST memcached-1.2.1.tar.gz 148755 RMD160 0b275591af74440f3de22946fb7ccc658f6578af SHA1 07ce5441874c052d28484070438822eedd7cc8ec SHA256 d489c1e8f9b149d7cde2bb1cb2c509ca6acedc32baed4e9b5f9e17d722c78c86
@@ -37,6 +38,7 @@ EBUILD memcached-1.3.0.ebuild 1626 RMD160 58827e010e169540c96b81deacc37e5a0aab20
 EBUILD memcached-1.3.3-r1.ebuild 1806 RMD160 65cb1604dd20ad81104d196bfb6ead0d57ff5cee SHA1 4cd2a308cf9b91dde4668a521bd7858165dad00a SHA256 983eef21af6d44b2685df6413e92a2c508422a6ce1e71aae203329b21dd65cd3
 EBUILD memcached-1.3.3-r2.ebuild 1819 RMD160 01630571e76e9d79e8ec06ddd7cd6ad1b6aaabd0 SHA1 bcb06a17ba7f947b2a309913472452d5178a2943 SHA256 41230a631a7bbd3d86ae12e1994f6d5f66191d5f94ed52c24838ce549b7a574a
 EBUILD memcached-1.3.3.ebuild 1714 RMD160 70359cf49548ad62315ed217c56f0987eb71c48c SHA1 eb8a43677aee0bf9623b997362e436ad2e1005e8 SHA256 e1d10d1c532cb9833248dd8fea30f029025092da83896b9d20298b333f22dd62
+EBUILD memcached-1.4.0-r1.ebuild 2241 RMD160 13e61e663cd021d434c8942a655a5d8f785ea61f SHA1 765640ecf3f77a7f498fd119b7af3f2f1092c1f8 SHA256 b26e28ddfeacb8163a85de77e5b3a1cda087e5b3ec57648da1ea4de7a30dc5a6
 EBUILD memcached-1.4.0.ebuild 1827 RMD160 2fee4f19753cb8760ce69a59a1534551f573b440 SHA1 4ae001c1b7616326255bbf8eb7af14771474f7cc SHA256 6f999dc74e4c98995da76bea11a305654dc34e77a1697c4e43e195736b7e2f44
-MISC ChangeLog 16154 RMD160 bc61bdfda2a7ac8edb11b6653d8e30f6c3a13d7a SHA1 3e828fdd069e3bde314da30aa9ab3b44cb3dc885 SHA256 fac45001f14fa23d28622663f15dd3bbab6b471977191539387bd598834f5e9a
+MISC ChangeLog 16539 RMD160 fa6a35323e6087dba71997ec4c8d5b8b02669c8c SHA1 14beb360698982d0eda86e7b019a8f204223a584 SHA256 c8b482ad8eac2a69c0dda2ffb869cac9818fdb5c5add4f12f659e94a395f3d3b
 MISC metadata.xml 966 RMD160 9da6a32f068f21da2b93ad45b4bba6147644e20a SHA1 a7080fc08dde81c21554beeb89b201d16efe08c1 SHA256 ce8186d4b0926cdc2ac0dcc49a737359b3f08a13396b5dc2cf05bf4a366b242b
diff --git a/net-misc/memcached/files/memcached-1.4.0-fix-as-needed-linking.patch b/net-misc/memcached/files/memcached-1.4.0-fix-as-needed-linking.patch
new file mode 100644
index 000000000000..d8a8ff295fc3
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.4.0-fix-as-needed-linking.patch
@@ -0,0 +1,47 @@
+Users that try to second-guess us and specify -DNDEBUG are just asking to cause
+problems. They cause breakage with the testapp and -debug versions.
+
+So let's ensure that testapp and -debug use per-object compile flags, and thus
+preventing flags leaking between stuff. The #undef at the top of testapp.c is
+redundant now, but not removed.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+X-Gentoo-Bug: 278780
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=278780
+
+diff -Nuar memcached-1.4.0/testapp.c memcached-1.4.0/testapp.c
+--- memcached-1.4.0/testapp.c	2009-07-09 09:43:42.000000000 -0700
++++ memcached-1.4.0/testapp.c	2009-07-27 16:41:14.468907751 -0700
+@@ -115,12 +115,16 @@
+     char old = *(p - 1);
+     *(p - 1) = 0;
+     cache_free(cache, p);
++#ifndef NDEBUG
+     assert(cache_error == -1);
++#endif
+     *(p - 1) = old;
+ 
+     p[sizeof(uint32_t)] = 0;
+     cache_free(cache, p);
++#ifndef NDEBUG
+     assert(cache_error == 1);
++#endif
+ 
+     /* restore signal handler */
+     sigaction(SIGABRT, &old_action, NULL);
+diff -Nuar memcached-1.4.0.orig/Makefile.am memcached-1.4.0/Makefile.am
+--- memcached-1.4.0.orig/Makefile.am	2009-07-09 09:43:42.000000000 -0700
++++ memcached-1.4.0/Makefile.am	2009-07-27 17:45:20.973106097 -0700
+@@ -27,8 +27,12 @@
+ 
+ memcached_debug_SOURCES = $(memcached_SOURCES)
+ memcached_CPPFLAGS = -DNDEBUG
++
+ memcached_debug_LDADD = @PROFILER_LDFLAGS@
+ memcached_debug_CFLAGS = @PROFILER_FLAGS@
++memcached_debug_CPPFLAGS = -UNDEBUG
++
++testapp_CPPFLAGS = -UNDEBUG
+ 
+ memcached_LDADD = 
+ memcached_DEPENDENCIES =
diff --git a/net-misc/memcached/memcached-1.4.0-r1.ebuild b/net-misc/memcached/memcached-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..d91ba126d3b8
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.0-r1.ebuild,v 1.1 2009/07/28 01:07:27 robbat2 Exp $
+
+EAPI=2
+inherit eutils autotools flag-o-matic
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://code.google.com/p/memcached/"
+SRC_URI="http://memcached.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="test slabs-reassign debug"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG
+	emake testapp memcached-debug CFLAGS="${CFLAGS}" || die "emake of testapp and memcached-debug failed."
+	filter-flags -UNDEBUG
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/init memcached
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test || die "Failed testing"
+}