[gentoo-commits] dev/mgorny:master commit in: sys-devel/multilib-gcc-wrapper/

[gentoo-commits] dev/mgorny:master commit in: sys-devel/multilib-gcc-wrapper/

[Michał Górny]

commit:     9a28529d05071e5a0ab00de2e757a49e01e62107
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 09:57:30 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 09:57:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=9a28529d

New awesome multilib-gcc-wrapper to play with distcc.

---
 .../multilib-gcc-wrapper-0.ebuild                  | 61 ++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild
new file mode 100644
index 0000000..adc2cae
--- /dev/null
+++ b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="Wrappers for gcc tools to be used on non-native CHOSTs"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="distcc"
+
+RDEPEND="sys-devel/gcc:="
+
+S=${WORKDIR}
+
+mkwrap() {
+	cat > "${T}"/wrapper <<-_EOF_
+		#!/bin/bash
+		exec ${1} $(get_abi_CFLAGS) "\${@}"
+	_EOF_
+
+	newbin "${T}"/wrapper "${2}"
+}
+
+src_install() {
+	local host_prefix=${CHOST}
+	local tools=( c++ cpp g++ gcc gfortran ) # XXX
+
+	if use distcc; then
+		local distcc_dir=/usr/$(get_libdir)/distcc/bin
+		local distcc_sym_prefix=../../../bin
+		dodir "${distcc_dir}"
+	fi
+
+	create_wrappers() {
+		[[ ${CHOST} == ${host_prefix} ]] && continue
+
+		local t e
+		for t in "${tools[@]}"; do
+			for e in "${ROOT%/}"/usr/bin/${host_prefix}-${t} \
+					"${ROOT%/}"/usr/bin/${host_prefix}-${t}-[34]*; do
+				local basename=${e##*/}
+				local newname=${basename/${host_prefix}/${CHOST}}
+
+				mkwrap "${basename}" "${newname}"
+
+				if use distcc; then
+					dosym "${distcc_sym_prefix}/${newname}" \
+						"${distcc_dir}/${newname}"
+				fi
+			done
+		done
+	}
+	multilib_foreach_abi create_wrappers
+}

[gentoo-commits] dev/mgorny:master commit in: sys-devel/multilib-gcc-wrapper/

[Michał Górny]

commit:     d49b23deafe4f3f22d463842338d45172dac73e3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 15:15:26 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 15:15:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=d49b23de

distcc symlinks should point to distcc, not gcc.

---
 sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild
index adc2cae..3e30431 100644
--- a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild
+++ b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild
@@ -34,7 +34,6 @@ src_install() {
 
 	if use distcc; then
 		local distcc_dir=/usr/$(get_libdir)/distcc/bin
-		local distcc_sym_prefix=../../../bin
 		dodir "${distcc_dir}"
 	fi
 
@@ -51,8 +50,7 @@ src_install() {
 				mkwrap "${basename}" "${newname}"
 
 				if use distcc; then
-					dosym "${distcc_sym_prefix}/${newname}" \
-						"${distcc_dir}/${newname}"
+					dosym /usr/bin/distcc "${distcc_dir}/${newname}"
 				fi
 			done
 		done

[gentoo-commits] dev/mgorny:master commit in: sys-devel/multilib-gcc-wrapper/

[Michał Górny]

commit:     e2f45100fd1c9e3372b56cb85ca441e2c21a165d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 30 18:55:26 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun 30 18:55:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=e2f45100

Clean up multilib-gcc-wrapper that goes into gx86.

---
 .../multilib-gcc-wrapper-0.ebuild                  | 59 ----------------------
 1 file changed, 59 deletions(-)

diff --git a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild
deleted file mode 100644
index 3e30431..0000000
--- a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="Wrappers for gcc tools to be used on non-native CHOSTs"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="distcc"
-
-RDEPEND="sys-devel/gcc:="
-
-S=${WORKDIR}
-
-mkwrap() {
-	cat > "${T}"/wrapper <<-_EOF_
-		#!/bin/bash
-		exec ${1} $(get_abi_CFLAGS) "\${@}"
-	_EOF_
-
-	newbin "${T}"/wrapper "${2}"
-}
-
-src_install() {
-	local host_prefix=${CHOST}
-	local tools=( c++ cpp g++ gcc gfortran ) # XXX
-
-	if use distcc; then
-		local distcc_dir=/usr/$(get_libdir)/distcc/bin
-		dodir "${distcc_dir}"
-	fi
-
-	create_wrappers() {
-		[[ ${CHOST} == ${host_prefix} ]] && continue
-
-		local t e
-		for t in "${tools[@]}"; do
-			for e in "${ROOT%/}"/usr/bin/${host_prefix}-${t} \
-					"${ROOT%/}"/usr/bin/${host_prefix}-${t}-[34]*; do
-				local basename=${e##*/}
-				local newname=${basename/${host_prefix}/${CHOST}}
-
-				mkwrap "${basename}" "${newname}"
-
-				if use distcc; then
-					dosym /usr/bin/distcc "${distcc_dir}/${newname}"
-				fi
-			done
-		done
-	}
-	multilib_foreach_abi create_wrappers
-}