diff options
Diffstat (limited to 'profiles/default/linux')
9 files changed, 27 insertions, 11 deletions
diff --git a/profiles/default/linux/amd64/17.1/profile.bashrc b/profiles/default/linux/amd64/17.1/profile.bashrc index 44dc51c55408..7019782fb8f9 100644 --- a/profiles/default/linux/amd64/17.1/profile.bashrc +++ b/profiles/default/linux/amd64/17.1/profile.bashrc @@ -1,7 +1,9 @@ -if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -L ${ROOT%/}/lib || -L ${ROOT%/}/usr/lib ]] ; then - eerror "Please follow the instructions in the news item:" - eerror "2017-12-26-experimental-amd64-17-1-profiles" - eerror "or choose the 17.0 profile." - die "ERROR: 17.1 migration has not been performed!!" +if [[ "${EBUILD_PHASE}" == "setup" ]] ; then + if [[ "$(realpath ${ROOT%/}/lib)" == "${ROOT%/}/lib64" || "$(realpath ${ROOT%/}/usr/lib)" == "${ROOT%/}/usr/lib64" ]] ; then + eerror "Please follow the instructions in the news item:" + eerror "2017-12-26-experimental-amd64-17-1-profiles" + eerror "or choose the 17.0 profile." + die "ERROR: 17.1 migration has not been performed!!" + fi fi diff --git a/profiles/default/linux/arm/13.0/armv6j/make.defaults b/profiles/default/linux/arm/13.0/armv6j/make.defaults new file mode 100644 index 000000000000..88750c055d7d --- /dev/null +++ b/profiles/default/linux/arm/13.0/armv6j/make.defaults @@ -0,0 +1,2 @@ +CHOST="armv6j-hardfloat-linux-gnueabi" +CHOST_arm="${CHOST}" diff --git a/profiles/default/linux/arm/13.0/armv7a/make.defaults b/profiles/default/linux/arm/13.0/armv7a/make.defaults new file mode 100644 index 000000000000..dd7639e152d5 --- /dev/null +++ b/profiles/default/linux/arm/13.0/armv7a/make.defaults @@ -0,0 +1,2 @@ +CHOST="armv7a-hardfloat-linux-gnueabi" +CHOST_arm="${CHOST}" diff --git a/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults b/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults index c0cb6c11748f..608aa101c645 100644 --- a/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults +++ b/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults @@ -1,7 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -CHOST="armv7a-hardfloat-linux-musleabi" +CHOST="armv7a-unknown-linux-musleabihf" +CHOST_arm="${CHOST}" + CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" diff --git a/profiles/default/linux/musl/arm/armv7a/make.defaults b/profiles/default/linux/musl/arm/armv7a/make.defaults index c680f6aa2e5a..9310aa7711dd 100644 --- a/profiles/default/linux/musl/arm/armv7a/make.defaults +++ b/profiles/default/linux/musl/arm/armv7a/make.defaults @@ -1,7 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation. +# Copyright 1999-2018 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 CHOST="armv7a-hardfloat-linux-musleabi" +CHOST_arm="${CHOST}" + CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" diff --git a/profiles/default/linux/musl/arm/make.defaults b/profiles/default/linux/musl/arm/make.defaults index e0e4051efde6..a56035197c43 100644 --- a/profiles/default/linux/musl/arm/make.defaults +++ b/profiles/default/linux/musl/arm/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation. +# Copyright 1999-2018 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 ARCH="arm" @@ -9,6 +9,7 @@ CFLAGS="-O2" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" +CHOST_arm="${CHOST}" # Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015) # Multilib-related setup, bug #515130 diff --git a/profiles/default/linux/uclibc/arm/armv6j/make.defaults b/profiles/default/linux/uclibc/arm/armv6j/make.defaults index 10e4e8d35be2..85682272eded 100644 --- a/profiles/default/linux/uclibc/arm/armv6j/make.defaults +++ b/profiles/default/linux/uclibc/arm/armv6j/make.defaults @@ -1,7 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation. +# Copyright 1999-2018 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 CHOST="armv6j-hardfloat-linux-uclibceabi" +CHOST_arm="${CHOST}" + CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" diff --git a/profiles/default/linux/uclibc/arm/armv7a/make.defaults b/profiles/default/linux/uclibc/arm/armv7a/make.defaults index 0ac8f14a75a5..397875e9b6bb 100644 --- a/profiles/default/linux/uclibc/arm/armv7a/make.defaults +++ b/profiles/default/linux/uclibc/arm/armv7a/make.defaults @@ -1,7 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation. +# Copyright 1999-2018 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 CHOST="armv7a-hardfloat-linux-uclibceabi" +CHOST_arm="${CHOST}" + CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" diff --git a/profiles/default/linux/uclibc/arm/make.defaults b/profiles/default/linux/uclibc/arm/make.defaults index a551dc5118c0..ae32c6cdd3ae 100644 --- a/profiles/default/linux/uclibc/arm/make.defaults +++ b/profiles/default/linux/uclibc/arm/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation. +# Copyright 1999-2018 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 ARCH="arm" @@ -9,6 +9,7 @@ CFLAGS="-O2" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" +CHOST_arm="${CHOST}" # Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015) # Multilib-related setup, bug #515130 |