diff options
Diffstat (limited to 'sys-devel')
4 files changed, 68 insertions, 9 deletions
diff --git a/sys-devel/gcc-config/files/gcc-config-kogaion-base-gcc-support-2.patch b/sys-devel/gcc-config/files/gcc-config-kogaion-base-gcc-support-2.patch new file mode 100644 index 00000000..35c38d4e --- /dev/null +++ b/sys-devel/gcc-config/files/gcc-config-kogaion-base-gcc-support-2.patch @@ -0,0 +1,18 @@ +diff -Nurp gcc-config-1.8.orig/gcc-config gcc-config-1.8/gcc-config +--- gcc-config-1.8.orig/gcc-config 2012-11-19 04:11:11.000000000 +0100 ++++ gcc-config-1.8/gcc-config 2013-05-22 22:22:06.187665419 +0200 +@@ -209,6 +209,14 @@ update_wrappers() { + ) + ) ) + ++ # Kogaion: base-gcc does not bring any gcc executables. Return 1 ++ # if ${ROOT}${GCC_PATH} does not exist without even trying to ++ # `cd` it. ++ if [[ ! -d "${ROOT}${GCC_PATH}" ]]; then ++ ewarn "The GCC compiler for ${CTARGET} is not installed." ++ return 1 ++ fi ++ + # See what new stuff we need to wrap up. + local new_wrappers=( $( + uniq_wrapper_list "${CC_COMP_VERSION}" $( diff --git a/sys-devel/gcc-config/files/gcc-config-kogaion-base-gcc-support.patch b/sys-devel/gcc-config/files/gcc-config-kogaion-base-gcc-support.patch new file mode 100644 index 00000000..4b61c6cd --- /dev/null +++ b/sys-devel/gcc-config/files/gcc-config-kogaion-base-gcc-support.patch @@ -0,0 +1,30 @@ +--- a/gcc-config ++++ b/gcc-config +@@ -209,6 +209,14 @@ update_wrappers() { + ) + ) ) + ++ # Kogaion: base-gcc does not bring any gcc executables. Return 1 ++ # if ${ROOT}${GCC_PATH} does not exist without even trying to ++ # `cd` it. ++ if [[ ! -d "${ROOT}${GCC_PATH}" ]]; then ++ ewarn "The GCC compiler for ${CTARGET} is not installed." ++ return 1 ++ fi ++ + # See what new stuff we need to wrap up. + local new_wrappers=( $( + uniq_wrapper_list "${CC_COMP_VERSION}" $( +@@ -331,6 +339,12 @@ handle_split_usr() { + + gcc="${ROOT}${LATEST_GCC_PATH}/gcc" + ++ # Kogaion: base-gcc does not carry the GCC executable, so ++ # skip this part ++ if [[ ! -x "${gcc}" ]]; then ++ return 0 ++ fi ++ + local multilib + for multilib in $("${gcc}" -print-multi-lib); do + local multiarg=${multilib#*;} diff --git a/sys-devel/gcc-config/gcc-config-1.7.3.ebuild b/sys-devel/gcc-config/gcc-config-1.7.3.ebuild index 35deb293..3fcf1be5 100644 --- a/sys-devel/gcc-config/gcc-config-1.7.3.ebuild +++ b/sys-devel/gcc-config/gcc-config-1.7.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.7.3.ebuild,v 1.8 2014/01/18 03:08:29 vapier Exp $ +# $Header: $ -inherit unpacker toolchain-funcs multilib eutils +inherit eutils unpacker toolchain-funcs multilib DESCRIPTION="utility to manage compilers" HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git" @@ -11,11 +11,16 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="" +src_unpack() { + unpacker_src_unpack + cd "${S}" || die + epatch "${FILESDIR}/${PN}-kogaion-base-gcc-support.patch" +} + src_compile() { - epatch ${FILESDIR}/${PN}-systemd.patch emake CC="$(tc-getCC)" || die } diff --git a/sys-devel/gcc-config/gcc-config-1.8.ebuild b/sys-devel/gcc-config/gcc-config-1.8.ebuild index 84ed5032..26bd27ea 100644 --- a/sys-devel/gcc-config/gcc-config-1.8.ebuild +++ b/sys-devel/gcc-config/gcc-config-1.8.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.8.ebuild,v 1.2 2014/01/18 03:08:29 vapier Exp $ +# $Header: $ -inherit unpacker toolchain-funcs multilib +inherit eutils unpacker toolchain-funcs multilib DESCRIPTION="utility to manage compilers" HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git" @@ -11,9 +11,15 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="" +src_unpack() { + unpacker_src_unpack + cd "${S}" || die + epatch "${FILESDIR}/${PN}-kogaion-base-gcc-support-2.patch" +} + src_compile() { emake CC="$(tc-getCC)" || die } |