Fix compilation with gcc 4.8, bug #514992 by patrick

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

7 files changed, 72 insertions, 157 deletions

diff --git a/sys-devel/dragonegg/ChangeLog b/sys-devel/dragonegg/ChangeLog
index 125c9e3b6ad6..98266d879e2c 100644
--- a/sys-devel/dragonegg/ChangeLog
+++ b/sys-devel/dragonegg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/dragonegg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/ChangeLog,v 1.18 2014/05/11 08:17:58 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/ChangeLog,v 1.19 2014/06/25 17:41:10 voyageur Exp $
+
+  25 Jun 2014; Bernard Cafarelli <voyageur@gentoo.org> -dragonegg-3.0.ebuild,
+  -dragonegg-3.1.ebuild, -dragonegg-3.2.ebuild, dragonegg-3.3.ebuild,
+  dragonegg-3.4.ebuild, +files/dragonegg-gcc-4.8.patch:
+  Fix compilation with gcc 4.8, bug #514992 by patrick
 
   11 May 2014; Bernard Cafarelli <voyageur@gentoo.org> dragonegg-3.4.ebuild:
   Relax dependency on llvm for 3.4.1
diff --git a/sys-devel/dragonegg/dragonegg-3.0.ebuild b/sys-devel/dragonegg/dragonegg-3.0.ebuild
deleted file mode 100644
index d4c7dc668efa..000000000000
--- a/sys-devel/dragonegg/dragonegg-3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.0.ebuild,v 1.3 2012/01/27 02:47:00 ottxor Exp $
-
-EAPI=4
-inherit multilib
-
-DESCRIPTION="GCC plugin that uses LLVM for optimization and code generation"
-HOMEPAGE="http://dragonegg.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="|| ( sys-devel/gcc:4.5[lto]
-		>=sys-devel/gcc-4.6 )
-	~sys-devel/llvm-${PV}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_}.src
-
-src_prepare() {
-	# Replace svnversion call
-	sed -e "s/\(^REVISION:=\).*/\1${PV}/" \
-		-i Makefile || die "Setting revision failed"
-}
-
-src_compile() {
-	# GCC: compiler to use plugin with
-	emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1
-}
-
-src_install() {
-	# Install plugin in llvm lib directory
-	exeinto /usr/$(get_libdir)/llvm
-	doexe dragonegg.so
-
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "To use dragonegg, run gcc as usual, with an extra command line argument:"
-	elog "	-fplugin=/usr/$(get_libdir)/llvm/dragonegg.so"
-	elog "If you change the active gcc profile, or update gcc to a new version,"
-	elog "you will have to remerge this package to update the plugin"
-}
diff --git a/sys-devel/dragonegg/dragonegg-3.1.ebuild b/sys-devel/dragonegg/dragonegg-3.1.ebuild
deleted file mode 100644
index 7695c4146cf3..000000000000
--- a/sys-devel/dragonegg/dragonegg-3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.1.ebuild,v 1.3 2012/07/04 00:32:46 mr_bones_ Exp $
-
-EAPI=4
-inherit multilib toolchain-funcs
-
-DESCRIPTION="GCC plugin that uses LLVM for optimization and code generation"
-HOMEPAGE="http://dragonegg.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
-	test? ( http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="test"
-
-DEPEND="|| ( sys-devel/gcc:4.5[lto]
-		>=sys-devel/gcc-4.6 )
-	~sys-devel/llvm-${PV}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_}.src
-
-src_prepare() {
-	# Replace svnversion call
-	sed -e "s/\(^REVISION:=\).*/\1${PV}/" \
-		-i Makefile || die "Setting revision failed"
-}
-
-src_compile() {
-	# GCC: compiler to use plugin with
-	emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1
-}
-
-src_test() {
-	emake LIT_DIR="${WORKDIR}"/llvm-${PV}.src/utils/lit check
-}
-
-src_install() {
-	# Install plugin in llvm lib directory
-	exeinto /usr/$(get_libdir)/llvm
-	doexe dragonegg.so
-
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "To use dragonegg, run gcc as usual, with an extra command line argument:"
-	elog "	-fplugin=/usr/$(get_libdir)/llvm/dragonegg.so"
-	elog "If you change the active gcc profile, or update gcc to a new version,"
-	elog "you will have to remerge this package to update the plugin"
-}
diff --git a/sys-devel/dragonegg/dragonegg-3.2.ebuild b/sys-devel/dragonegg/dragonegg-3.2.ebuild
deleted file mode 100644
index f91109b992c3..000000000000
--- a/sys-devel/dragonegg/dragonegg-3.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.2.ebuild,v 1.1 2012/12/21 09:18:50 voyageur Exp $
-
-EAPI=5
-inherit multilib toolchain-funcs
-
-DESCRIPTION="GCC plugin that uses LLVM for optimization and code generation"
-HOMEPAGE="http://dragonegg.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
-	test? ( http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="test"
-
-DEPEND="|| ( sys-devel/gcc:4.5[lto]
-		>=sys-devel/gcc-4.6 )
-	~sys-devel/llvm-${PV}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}.src
-
-src_compile() {
-	# GCC: compiler to use plugin with
-	emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1
-}
-
-src_test() {
-	# GCC languages are determined via locale-dependant gcc -v output
-	export LC_ALL=C
-
-	emake LIT_DIR="${WORKDIR}"/llvm-${PV}.src/utils/lit check
-}
-
-src_install() {
-	# Install plugin in llvm lib directory
-	exeinto /usr/$(get_libdir)/llvm
-	doexe dragonegg.so
-
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "To use dragonegg, run gcc as usual, with an extra command line argument:"
-	elog "	-fplugin=/usr/$(get_libdir)/llvm/dragonegg.so"
-	elog "If you change the active gcc profile, or update gcc to a new version,"
-	elog "you will have to remerge this package to update the plugin"
-}
diff --git a/sys-devel/dragonegg/dragonegg-3.3.ebuild b/sys-devel/dragonegg/dragonegg-3.3.ebuild
index afe0e548191b..8d4fde4660b2 100644
--- a/sys-devel/dragonegg/dragonegg-3.3.ebuild
+++ b/sys-devel/dragonegg/dragonegg-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.3.ebuild,v 1.1 2013/06/18 22:14:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.3.ebuild,v 1.2 2014/06/25 17:41:10 voyageur Exp $
 
 EAPI=5
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="GCC plugin that uses LLVM for optimization and code generation"
 HOMEPAGE="http://dragonegg.llvm.org/"
@@ -22,6 +22,10 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}.src
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-gcc-4.8.patch
+}
+
 src_compile() {
 	# GCC: compiler to use plugin with
 	emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1
diff --git a/sys-devel/dragonegg/dragonegg-3.4.ebuild b/sys-devel/dragonegg/dragonegg-3.4.ebuild
index e18ba5fcf517..4f01474f1853 100644
--- a/sys-devel/dragonegg/dragonegg-3.4.ebuild
+++ b/sys-devel/dragonegg/dragonegg-3.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.4.ebuild,v 1.2 2014/05/11 08:17:58 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.4.ebuild,v 1.3 2014/06/25 17:41:10 voyageur Exp $
 
 EAPI=5
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="GCC plugin that uses LLVM for optimization and code generation"
 HOMEPAGE="http://dragonegg.llvm.org/"
@@ -20,6 +20,10 @@ DEPEND="|| ( sys-devel/gcc:4.5[lto]
 	=sys-devel/llvm-${PV}*"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-gcc-4.8.patch
+}
+
 src_compile() {
 	# GCC: compiler to use plugin with
 	emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1
diff --git a/sys-devel/dragonegg/files/dragonegg-gcc-4.8.patch b/sys-devel/dragonegg/files/dragonegg-gcc-4.8.patch
new file mode 100644
index 000000000000..6d9c6796b2ad
--- /dev/null
+++ b/sys-devel/dragonegg/files/dragonegg-gcc-4.8.patch
@@ -0,0 +1,53 @@
+--- dragonegg/trunk/src/x86/ABIHack.inc	2014/05/13 21:07:34	208729
++++ dragonegg/trunk/src/x86/ABIHack.inc	2014/05/13 21:28:43	208730
+@@ -1644,50 +1644,6 @@
+   const int align_func;
+ };
+ 
+-static const struct ptt processor_target_table[PROCESSOR_max] =
+-{
+-  {&i386_cost, 4, 3, 4, 3, 4},
+-  {&i486_cost, 16, 15, 16, 15, 16},
+-  {&pentium_cost, 16, 7, 16, 7, 16},
+-  {&pentiumpro_cost, 16, 15, 16, 10, 16},
+-  {&geode_cost, 0, 0, 0, 0, 0},
+-  {&k6_cost, 32, 7, 32, 7, 32},
+-  {&athlon_cost, 16, 7, 16, 7, 16},
+-  {&pentium4_cost, 0, 0, 0, 0, 0},
+-  {&k8_cost, 16, 7, 16, 7, 16},
+-  {&nocona_cost, 0, 0, 0, 0, 0},
+-  {&core2_cost, 16, 10, 16, 10, 16},
+-  {&generic32_cost, 16, 7, 16, 7, 16},
+-  {&generic64_cost, 16, 10, 16, 10, 16},
+-  {&amdfam10_cost, 32, 24, 32, 7, 32},
+-  {&atom_cost, 16, 7, 16, 7, 16}
+-};
+-
+-static const char *const cpu_names[TARGET_CPU_DEFAULT_max] =
+-{
+-  "generic",
+-  "i386",
+-  "i486",
+-  "pentium",
+-  "pentium-mmx",
+-  "pentiumpro",
+-  "pentium2",
+-  "pentium3",
+-  "pentium4",
+-  "pentium-m",
+-  "prescott",
+-  "nocona",
+-  "core2",
+-  "atom",
+-  "geode",
+-  "k6",
+-  "k6-2",
+-  "k6-3",
+-  "athlon",
+-  "athlon-4",
+-  "k8",
+-  "amdfam10"
+-};
+ 
+ 
+ /* Return the "natural" mode for TYPE.  In most cases, this is just TYPE_MODE.