commit: cd566f05c030100ac7b097d094cd36f16f955d6c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jan 21 10:24:50 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Feb 1 12:27:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd566f05
profiles/*/ppc64: stop using features/64bit-native profiles/arch/powerpc/ppc64/64le/make.defaults | 6 +++++- profiles/arch/powerpc/ppc64/64le/parent | 1 - profiles/arch/powerpc/ppc64/64le/use.mask | 7 +++++++ profiles/arch/powerpc/ppc64/64ul/make.defaults | 5 ++++- profiles/arch/powerpc/ppc64/64ul/parent | 1 - profiles/arch/powerpc/ppc64/64ul/use.mask | 4 ++++ .../hardened/linux/powerpc/ppc64/64bit-userland/make.defaults | 8 ++++++++ profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent | 1 - 8 files changed, 28 insertions(+), 5 deletions(-) diff --git a/profiles/arch/powerpc/ppc64/64le/make.defaults b/profiles/arch/powerpc/ppc64/64le/make.defaults index 3f18179..64cad24 100644 --- a/profiles/arch/powerpc/ppc64/64le/make.defaults +++ b/profiles/arch/powerpc/ppc64/64le/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,3 +7,7 @@ CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" + +# moved from 64bit-native, TODO: move it upwards +SYMLINK_LIB="yes" +LIBDIR_ppc64="lib64" diff --git a/profiles/arch/powerpc/ppc64/64le/parent b/profiles/arch/powerpc/ppc64/64le/parent index 00012cf..f3229c5b 100644 --- a/profiles/arch/powerpc/ppc64/64le/parent +++ b/profiles/arch/powerpc/ppc64/64le/parent @@ -1,2 +1 @@ -../../../../features/64bit-native .. diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask new file mode 100644 index 00000000..dc7ace0 --- /dev/null +++ b/profiles/arch/powerpc/ppc64/64le/use.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# 2008/02/13 - Chris Gianelloni <wolf3...@gentoo.org> +# Mask multilib, since we cannot use it. +multilib diff --git a/profiles/arch/powerpc/ppc64/64ul/make.defaults b/profiles/arch/powerpc/ppc64/64ul/make.defaults index d740c6b..02dca65 100644 --- a/profiles/arch/powerpc/ppc64/64ul/make.defaults +++ b/profiles/arch/powerpc/ppc64/64ul/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,3 +9,6 @@ MULTILIB_ABIS="ppc64" CFLAGS_ppc64="-m64" +# moved from 64bit-native, TODO: move it upwards +SYMLINK_LIB="yes" +LIBDIR_ppc64="lib64" diff --git a/profiles/arch/powerpc/ppc64/64ul/parent b/profiles/arch/powerpc/ppc64/64ul/parent index 00012cf..f3229c5b 100644 --- a/profiles/arch/powerpc/ppc64/64ul/parent +++ b/profiles/arch/powerpc/ppc64/64ul/parent @@ -1,2 +1 @@ -../../../../features/64bit-native .. diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask index 6a1af02..cea52a1 100644 --- a/profiles/arch/powerpc/ppc64/64ul/use.mask +++ b/profiles/arch/powerpc/ppc64/64ul/use.mask @@ -76,3 +76,7 @@ audit # unregisterised ghc arch for now. # no ghci - no TH template_haskell + +# 2008/02/13 - Chris Gianelloni <wolf3...@gentoo.org> +# Mask multilib, since we cannot use it. +multilib diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults new file mode 100644 index 00000000..26e49fc --- /dev/null +++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults @@ -0,0 +1,8 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# moved from features/64bit-native +# TODO: figure out how to inherit this from arch profile +SYMLINK_LIB="yes" +LIBDIR_ppc64="lib64" diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent index 52bcba7..f3229c5b 100644 --- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent +++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent @@ -1,2 +1 @@ .. -../../../../../features/64bit-native