diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-04-27 07:45:55 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-04-27 07:45:55 +0000 |
| commit | 4c38db41ed6637f348eb3198a62465592507275d (patch) | |
| tree | 756ac7c1a8fee1f19a9cb9e22af918c4d310960c /app-benchmarks/i7z | |
| parent | Revert only change between .10 and .11.1, which completely broke the whole thing (diff) | |
| download | historical-4c38db41ed6637f348eb3198a62465592507275d.tar.gz historical-4c38db41ed6637f348eb3198a62465592507275d.tar.bz2 historical-4c38db41ed6637f348eb3198a62465592507275d.zip | |
Fix for gcc46
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'app-benchmarks/i7z')
| -rw-r--r-- | app-benchmarks/i7z/ChangeLog | 6 | ||||
| -rw-r--r-- | app-benchmarks/i7z/Manifest | 13 | ||||
| -rw-r--r-- | app-benchmarks/i7z/files/0.26-gcc46.patch | 19 | ||||
| -rw-r--r-- | app-benchmarks/i7z/i7z-0.26.ebuild | 6 |
4 files changed, 35 insertions, 9 deletions
diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog index 412c32582d43..9d00f59cb0e1 100644 --- a/app-benchmarks/i7z/ChangeLog +++ b/app-benchmarks/i7z/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-benchmarks/i7z # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.2 2011/02/08 17:55:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.3 2011/04/27 07:45:55 jlec Exp $ + + 27 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/0.26-gcc46.patch, + i7z-0.26.ebuild: + Fix for gcc46 08 Feb 2011; Justin Lecher <jlec@gentoo.org> i7z-0.26.ebuild: Do not install outside EPREFIX diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest index 8e568175fa82..41ba6551d0d7 100644 --- a/app-benchmarks/i7z/Manifest +++ b/app-benchmarks/i7z/Manifest @@ -1,15 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 0.26-gcc46.patch 575 RMD160 9475df63439cbfba5306bb2c41736af6e76ab3bc SHA1 46a16f3b6b576eb6c6c1941bc1c07dff7441a4d0 SHA256 461a6a3e57f54d3b67d557c69e7fdc032647d8a1c1ac54aebdfc82b812f0497b AUX 0.26-gentoo.patch 1341 RMD160 a4f8d6bb7b264133ba44f7f7a29aef6659d5a839 SHA1 16ef35271a623b16c601e12d22e1a39fcee4b329 SHA256 ea831b1aca9772c7de12e9bc6a8d7f31fa93f4fa2cb0f721a76f9004c524d884 DIST i7z-0.26.tar.gz 30539 RMD160 580a11cc820a0037e196533ab0bfae9e5f3669b8 SHA1 a0c4e00867955f00708aefcf4a7f4406e4c08423 SHA256 68cf43fc583f2da7f372644f77e83901141543fe47665c9c0148b80258782f85 -EBUILD i7z-0.26.ebuild 918 RMD160 8df253a19aa52b5d04279ac0de9aa71fdad76bd1 SHA1 212953f839c2008124e57995179b6c744b4a9efe SHA256 2e81e12a84e395aae869a8d814748b13f96f435c0b00e77994076ed39ca69039 -MISC ChangeLog 483 RMD160 665465204237654156c925bfb51b96d970206900 SHA1 2a8ee600720fc41003c90f417cbe3c6b29e34c21 SHA256 5c1a7266cdf7901d3a5a5afdb998fe0c4853363462a17bccf7ccf15f143b422a +EBUILD i7z-0.26.ebuild 958 RMD160 8752b836f7d30d4e3b81d5307132a0db416abac5 SHA1 a193f73c8d54466e90a023d970c0613b9999ff42 SHA256 0fb7b5927aa040fdf0094aee07987e09fd619ed2cefac718704d702e2e782d64 +MISC ChangeLog 591 RMD160 987754ed17514e9b2cca6e2f816974910acb385c SHA1 b3b284aca4220b94661e579f711e73e6fd9bf156 SHA256 c0b9f76f51b81a8e2ad6cce286a311f8e199a4eadd6de876d3a8c6ccc8661cc2 MISC metadata.xml 220 RMD160 435928b54535666360b3bf96aaa03430383339b8 SHA1 72650d93162578d87307bdef5caf72c5ee15c97a SHA256 e08cbf772d3bdb38ef895160c6573fdd3b1e81aea8f85a8cef84f5964d578fc4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1Rg6AACgkQgAnW8HDreRamSgCgmXlH0Dc3o1yknxnXy++Ys10p -xwoAn2zQIX//yamdJnQFavQGlziWWGTe -=apeS +iEYEARECAAYFAk23ybgACgkQgAnW8HDreRa9AQCggVeltmruAqX36Gru1RLd5dKk +PygAmQFHvI32k3cswGUaUrsn7MbTwehT +=xOs1 -----END PGP SIGNATURE----- diff --git a/app-benchmarks/i7z/files/0.26-gcc46.patch b/app-benchmarks/i7z/files/0.26-gcc46.patch new file mode 100644 index 000000000000..08ad216566b4 --- /dev/null +++ b/app-benchmarks/i7z/files/0.26-gcc46.patch @@ -0,0 +1,19 @@ +--- /tmp/GUI_i7z-50.cpp ++++ i7z/GUI/GUI_i7z.cpp +@@ -48,10 +48,14 @@ + void Construct_Socket_Information_in_GUI(unsigned int *numCPUs) { + socket_0.max_cpu=0; + socket_0.socket_num=0; +- socket_0.processor_num={-1,-1,-1,-1,-1,-1,-1,-1}; ++ int i; ++ for(i=0;i < 8; i++) ++ socket_0.processor_num[i]=-1; + socket_1.max_cpu=0; + socket_1.socket_num=1; +- socket_1.processor_num={-1,-1,-1,-1,-1,-1,-1,-1}; ++ ++ for(i=0;i < 8; i++) ++ socket_1.processor_num[i]=-1; + + construct_CPU_Heirarchy_info(&chi); + construct_sibling_list(&chi); diff --git a/app-benchmarks/i7z/i7z-0.26.ebuild b/app-benchmarks/i7z/i7z-0.26.ebuild index 2bc38f87496e..08ffe3305de4 100644 --- a/app-benchmarks/i7z/i7z-0.26.ebuild +++ b/app-benchmarks/i7z/i7z-0.26.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/app-benchmarks/i7z/i7z-0.26.ebuild,v 1.2 2011/02/08 17:55:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.26.ebuild,v 1.3 2011/04/27 07:45:55 jlec Exp $ EAPI="3" @@ -21,7 +21,9 @@ RDEPEND=" DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}"/${PV}-gentoo.patch + epatch \ + "${FILESDIR}"/${PV}-gentoo.patch \ + "${FILESDIR}"/${PV}-gcc46.patch tc-export CC } |