From 56d5934e1933443c317043136cb1b2c862c4e339 Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Fri, 31 Jul 2009 09:37:03 +0000 Subject: Fixing compilation issue. Bug 264067. Thanks to Robert Lewis. Package-Manager: portage-13856-svn/cvs/Linux i686 --- app-arch/upm/ChangeLog | 6 +++++- app-arch/upm/Manifest | 15 +++------------ app-arch/upm/files/upm-0.85-static.patch | 30 ++++++++++++++++++++++++++++++ app-arch/upm/upm-0.85.ebuild | 8 +++++--- 4 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 app-arch/upm/files/upm-0.85-static.patch (limited to 'app-arch') diff --git a/app-arch/upm/ChangeLog b/app-arch/upm/ChangeLog index c9b4f2d5eb4b..a780f6358f2f 100644 --- a/app-arch/upm/ChangeLog +++ b/app-arch/upm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/upm # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/upm/ChangeLog,v 1.10 2009/03/28 13:59:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/upm/ChangeLog,v 1.11 2009/07/31 09:37:03 volkmar Exp $ + + 31 Jul 2009; Mounir Lamouri + +files/upm-0.85-static.patch, upm-0.85.ebuild: + Fixing compilation issue. Bug 264067. Thanks to Robert Lewis. 28 Mar 2009; Diego E. Pettenò upm-0.85.ebuild: Die during src_compile if make fails. diff --git a/app-arch/upm/Manifest b/app-arch/upm/Manifest index 262d97a676d6..a314dff4b71f 100644 --- a/app-arch/upm/Manifest +++ b/app-arch/upm/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX upm-0.85-gentoo.diff 979 RMD160 3c6877d0f012a6a3e6a222240a34cefc2dd58202 SHA1 855b5ba8e2d7f79cd93b6cd6231a829d5081e34b SHA256 ad1017d7f362f948da157aaa7dece57e9815694a721130e55a5f0a8ef473e126 +AUX upm-0.85-static.patch 860 RMD160 c4b545a8c216093aad865095926df76af3f58469 SHA1 5a7fc80fd5dc53aad1597ad53c7968b4981ace78 SHA256 6e7687a73c0b9d2d5ad58d8805978531341f9461e26743496cc661310bca89b0 DIST upm-0.85.tar.gz 110946 RMD160 9c5f14700b8a06a083a043e9d7f32eba6108a16f SHA1 e5643ccc1e2934b21d958f3acfa0a75a0f0463d7 SHA256 09d6ab254c48eb10e879b6e048962e00bd896dace0d9bc1b2e4b1ff0c411560a -EBUILD upm-0.85.ebuild 738 RMD160 8ec58f8236fcdfe6d5dd9fea666870e3f0284a81 SHA1 fe10fccda3325eea654bea1361e34f23f30ff61f SHA256 9b2c1efb32d51d39e47d7e5bf03825f77bc4de5fa7667e4934024abfd362cecc -MISC ChangeLog 818 RMD160 ad32943b491fa7793ac7a1063b5e42a50e219564 SHA1 5163e535ffd61d2717c741efe9c9b05d092d8eb6 SHA256 208b030972a31e296cd5000ad81aa35a933922af94bb47e4242d78469a473a50 +EBUILD upm-0.85.ebuild 833 RMD160 eb8d5291722839fe29f7899c531450a818cf37d9 SHA1 38a542e4627f0a34d3158e5756a28ab7861be953 SHA256 cdf4c1869518298b4f8e8c6f093edd9fa54eb3f8ec5cf490bd49e6bc970c6e74 +MISC ChangeLog 981 RMD160 d8ae86b6f5c2b47ebcbf99f3a01d632d962d7a95 SHA1 89b2b2f4c5ccaffe996ffd83632f973c0843d575 SHA256 f9dc6123f826468b87712fca461f5e8b84956d21f44eb93f20fb325852cb4359 MISC metadata.xml 313 RMD160 1a5e62be2df6b8e9e76beb0a79480b96080909d8 SHA1 6d5b01ce6585be1357493f5efb59b115a8104f09 SHA256 33c06e5a4f07dc0e7bf98e9c06b16710488444cd087b13c20ef165960d078c3a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAknOLTEACgkQAiZjviIA2XgozACgsF0Zun+aHfD4bg2jUGMWRgrg -AGcAn1CiAC7WDnjjBgt9AGRzSpOBFCzT -=zhv9 ------END PGP SIGNATURE----- diff --git a/app-arch/upm/files/upm-0.85-static.patch b/app-arch/upm/files/upm-0.85-static.patch new file mode 100644 index 000000000000..52f28f716769 --- /dev/null +++ b/app-arch/upm/files/upm-0.85-static.patch @@ -0,0 +1,30 @@ +Fix compilation issue. +Look at https://bugs.gentoo.org/264067 +Thanks to Robert Lewis +--- a/upm-0.85/upm.c 2009-04-27 22:48:39.265036979 -0400 ++++ b/upm-0.85/upm.c 2009-04-27 22:49:01.724787260 -0400 +@@ -2235,21 +2235,21 @@ + ************************************************************/ + + /* Fast way to read octals */ +-unsigned inline moct(char *s) { ++static unsigned inline moct(char *s) { + unsigned int x=0; + while (isdigit(*s)) x=x*8+*s++-'0'; + return x; + } + + /* Fast way to read ints */ +-unsigned inline mint(char *s) { ++static unsigned inline mint(char *s) { + unsigned int x=0; + while (isdigit(*s)) x=x*10+*s++-'0'; + return x; + } + + /* Fast way to read long ints */ +-unsigned long long inline mlong(char *s) { ++static unsigned long long inline mlong(char *s) { + unsigned long long x=0; + while (isdigit(*s)) x=x*10+*s++-'0'; + return x; diff --git a/app-arch/upm/upm-0.85.ebuild b/app-arch/upm/upm-0.85.ebuild index 44e9a9dac5f5..68b86c670cd7 100644 --- a/app-arch/upm/upm-0.85.ebuild +++ b/app-arch/upm/upm-0.85.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/upm/upm-0.85.ebuild,v 1.12 2009/03/28 13:59:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/upm/upm-0.85.ebuild,v 1.13 2009/07/31 09:37:03 volkmar Exp $ inherit eutils @@ -14,10 +14,12 @@ KEYWORDS="alpha ~hppa ppc ~sparc x86" IUSE="" DEPEND="sys-apps/fakeroot" +RDEPEND=${DEPEND} src_unpack() { unpack ${P}.tar.gz - epatch ${FILESDIR}/${P}-gentoo.diff + epatch "${FILESDIR}"/${P}-gentoo.diff + epatch "${FILESDIR}"/${P}-static.patch # bug 264067 } src_compile() { @@ -26,7 +28,7 @@ src_compile() { src_install() { dodir /bin - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die "make install failed" dodir /usr/upm/installed dodir /var/upm/{binary,cache} } -- cgit v1.2.3-65-gdbad