From 061229f49a1a02639fc8a6ffdb7a4e496bd495c1 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Sun, 20 Nov 2011 09:39:09 +0000 Subject: [PATCH] Apply debian hack to fix build failure on ppc* wrt #365303. ppc/ppc64 stable wrt #327725 Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64 --- dev-libs/libmemcache/ChangeLog | 8 +++- dev-libs/libmemcache/Manifest | 23 +++++++---- .../libmemcache-1.4.0_rc2-ppc_ftbfs.patch | 40 +++++++++++++++++++ .../libmemcache-1.4.0_rc2-r1.ebuild | 5 ++- 4 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch diff --git a/dev-libs/libmemcache/ChangeLog b/dev-libs/libmemcache/ChangeLog index e9d1a3f461f4..3d0059183546 100644 --- a/dev-libs/libmemcache/ChangeLog +++ b/dev-libs/libmemcache/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libmemcache # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/ChangeLog,v 1.34 2011/04/16 18:25:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/ChangeLog,v 1.35 2011/11/20 09:39:09 xarthisius Exp $ + + 20 Nov 2011; Kacper Kowalik + libmemcache-1.4.0_rc2-r1.ebuild, + +files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch: + Apply debian hack to fix build failure on ppc* wrt #365303. ppc/ppc64 stable + wrt #327725 16 Apr 2011; Raúl Porcel libmemcache-1.4.0_rc2-r1.ebuild: diff --git a/dev-libs/libmemcache/Manifest b/dev-libs/libmemcache/Manifest index fd54ff9ca7b0..86fcfca81f28 100644 --- a/dev-libs/libmemcache/Manifest +++ b/dev-libs/libmemcache/Manifest @@ -3,18 +3,27 @@ Hash: SHA256 AUX libmemcache-1.4.0_rc2-implicit_pointer.patch 385 RMD160 d4eb8be173a6371a8539acc03638c8422cf46d1a SHA1 2c8bf8c4da9ca2071a68c3cf7bf1bed5dcf60ed3 SHA256 244cb27b979e58a2814580e81f3eb75b2bdf1421397519cb9d15534f0b3d7d16 AUX libmemcache-1.4.0_rc2-inline.patch 2051 RMD160 9950d88554bde039561db0ca9866d37cfc8c2e21 SHA1 dac8b2a84cf3fcb2b26d00897ff2edab52c5a024 SHA256 7e02de6171d80776c191f481ba0b30383ddd8e02c4b5f8247f5ddd0af666ec3b +AUX libmemcache-1.4.0_rc2-ppc_ftbfs.patch 983 RMD160 cba0bcb2d38ac056f14fb88e01c9470f1b04bb23 SHA1 624c3c201f11bcd87bdb465efafbaefa8e8f2811 SHA256 aeab1f03859bf4d88ef3f97bf40c1f342c4e23fb5b415e3d9c856175ebe855d7 DIST libmemcache-1.2.4.tar.bz2 40861 RMD160 2c21c3de0e18af34e2f100879e10d714db0a7c3b SHA1 e83f8fea9d4c2a1ef0da06a097033387d07056ff SHA256 c70f857753998106ac7d3542bd15014438270d261da4b3c24279e1db43f24dca DIST libmemcache-1.4.0.rc2.tar.bz2 301136 RMD160 b1e55c9ed7d487e3aafb3a85ba2e3386aa2b82f3 SHA1 7771a6477988cb5a8a9398839d63aaf491386130 SHA256 f496d41092c697384a7180720689da6a85d7c6ea2283eca69c8aaff2b58bebbf EBUILD libmemcache-1.2.4-r2.ebuild 968 RMD160 1363e7fb02978fa30384789891cd07852bdf1485 SHA1 f8ae7cc542213810db0c3e282132989285856bd9 SHA256 ea0f650e50e5ec4b474e7a6d9529bdbd1b5ed2e89ac884869cffecfcd5bff13f -EBUILD libmemcache-1.4.0_rc2-r1.ebuild 1102 RMD160 a566fa60b41d8cabbde5d27d1d15281c9bd33c00 SHA1 0dcd4a31d1b122c6598378be189d3c664006e69e SHA256 e465fc7bf90898958a5d01d9bbbacc12ae690fc676a79f96c1553165a6387e56 -MISC ChangeLog 4550 RMD160 8a3ae08787399c756e82b3e04041a2326c6ca857 SHA1 b46bfd8456b520ca509779afae06224d4a789f6e SHA256 495741441cabc4d6653b3340b1295a716301808d841930b42568f498b5e5050a +EBUILD libmemcache-1.4.0_rc2-r1.ebuild 1174 RMD160 041320cf018f58c3b9ed75e4c8be537e1a67ac3a SHA1 9296a80670fe722ae5efe2075907be1b936e73fc SHA256 4878755ee6b3e522445a2a77f65ed38fe14e7f4786a524492973c614b22c5e86 +MISC ChangeLog 4784 RMD160 a613d496ad5af3a95b96a7bee44640eb0134a973 SHA1 7810217c845f48299527f7c08fd23a6fafa1e1f3 SHA256 52efc9e73a2b5e77407055ba1979ba78b3586ca4b73894f77db726ca21261ccd MISC metadata.xml 204 RMD160 c8357c2cfd2ae4415ccd01ab839a3a4260fd8367 SHA1 7e046a19d6d3ac8caa658059c5c268630d1e99df SHA256 f3aeb60df346d19b4d43cea2b2916d51674d99dabfce252723548687909cbd6b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59C7QACgkQfXuS5UK5QB3MfgP/d0Xv2VCx4SXnfM3vAtO0/Zl/ -/a/pZ1PTdOZ3XnQ6UIIaz4gCjlXllBdZRNSDJ9y+6tIBRFvx4LM40a87MpeqV0qb -oh+NOxTj6MLbHlisD4wn8ZeQ9JA9fqa+/eKq2t5HM99OfSVAdtIk5LnNwWUbU/Y7 -ikDbGrI2ZCvPtu/TsKU= -=G7IK +iQIcBAEBCAAGBQJOyMrGAAoJEF0huFKJUZL5jeEP/3kVEmg0Z37A0Njjb18rZIE+ +phxyrChrkY01Sti2agGEorqKAGbbyzTraAxTl1A5uhbjJvaQQVOxzdWzyKdi3NsR +uEDg6E3UdIeYjKH48O68V2tgcZx0+6BZrNYtbNuIBj4T9qymQJr6Lzgf6rt47qbM ++9oxVx5pQSgJW+DmCRQIRLg3PcAKMSplWlec4vHEnAnVzo1x/Z7bGYam6uzG4eag +XK0CProJxwNAGIBG3vZ8qAgSjxRPnFe9jlg56IuPbdJ0fislnlTJ0UuscNXso+si +7vvGf/dfFyCBNd0wMZFXtOv9kzOLsdzj3PyH13X55U0V3+JywbcP6xEyoyOl4AQe +bo0fGOYbmj1X383tGoi6IwPiPi6u0W4GStWVH9aHrebDC4bjPi4nFBdSeE+87Ee2 +DvwI6c4myAeHFQmTE821bNdb4StG9aq4Gfq6dPOHYcsJ3NpmUJVIJeUSXcb8w0Rv +9/MIEnH+Ho0Ye/H2/C5pj8Yq46Jc9KquWcn8Ka3u5a60vhw/zB5HZYfBJUR1r6rW +fBtLSfsTbAAXdGicHZf1ZgFcBgvU4Fc/5CZReD8uleAsEPt3L9t0M11X8DbwnUEU +tDL10r0V7mT0qvphwOIjVhEEtEmq07Cc1IC3m0rcw1YPDGH3CFH0RZZnZpM8iReh +bJwazhR8+bPumlkvajfG +=ZzKJ -----END PGP SIGNATURE----- diff --git a/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch b/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch new file mode 100644 index 000000000000..dbeee57b1c6b --- /dev/null +++ b/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch @@ -0,0 +1,40 @@ +Debian patch: 10_ftbfs_fix_powerpc.patch +Fixing build on PowerPC +https://bugs.gentoo.org/show_bug.cgi?id=365303 + +--- a/include/memcache.h.in ++++ b/include/memcache.h.in +@@ -61,6 +61,11 @@ + #ifndef MEMCACHE_H + #define MEMCACHE_H + ++/* fix FTBFS on powerpc for Debian libmemcache */ ++#ifndef __USE_POSIX ++#define __USE_POSIX ++#endif ++ + #include + #include + #include +--- a/src/memcache.c ++++ b/src/memcache.c +@@ -39,12 +39,17 @@ + #include + #include + #include +-#ifdef __linux ++ ++/* fix FTBFS on powerpc for Debian libmemcache. I personally think this ++ * shouldnt be the case, as Debian Bug#345587 seems to show. */ ++ ++/* #ifdef __linux */ + # ifndef __USE_POSIX + # define __USE_POSIX + #warning "Working around busted-ass Linux header include problems: use FreeBSD instead" + #warning "http://www.FreeBSD.org/ - you won't regret it" +-# endif ++/* #endif */ ++ + #endif + #include + #include diff --git a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild index f41d1f8feaf4..967432b67c17 100644 --- a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild +++ b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild,v 1.12 2011/04/16 18:25:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild,v 1.13 2011/11/20 09:39:09 xarthisius Exp $ EAPI=3 inherit autotools eutils toolchain-funcs @@ -13,7 +13,7 @@ SRC_URI="http://people.freebsd.org/~seanc/libmemcache/${MY_P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" S=${WORKDIR}/${MY_P} @@ -21,6 +21,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { epatch "${FILESDIR}"/${P}-inline.patch epatch "${FILESDIR}"/${P}-implicit_pointer.patch + [[ $(tc-arch) == ppc* ]] && epatch "${FILESDIR}"/${P}-ppc_ftbfs.patch rm -rf test/unit || die sed -i -e '/DIR/s,unit,,g' test/Makefile.am || die -- 2.26.2