From 30c53e395853f5bfe805a1e429fcf26666eed8f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 17 May 2018 22:49:47 +0100 Subject: gentoo resync : 17.05.2018 --- profiles/arch/amd64/package.use.force | 4 ++++ profiles/arch/arm/armv4/make.defaults | 2 ++ profiles/arch/arm/armv4t/make.defaults | 2 ++ profiles/arch/arm/armv5te/make.defaults | 2 ++ profiles/arch/arm/armv6j/make.defaults | 4 +++- profiles/arch/arm/armv7a/make.defaults | 4 +++- profiles/arch/arm64/package.use.force | 4 ++++ profiles/arch/powerpc/ppc32/package.use.mask | 4 ---- profiles/arch/powerpc/ppc64/64ul/package.use.mask | 4 ---- profiles/arch/sparc/package.use.mask | 3 --- profiles/arch/x86/package.use.force | 4 ++++ 11 files changed, 24 insertions(+), 13 deletions(-) (limited to 'profiles/arch') diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force index d35dfcf8dc5a..eecfbb757e49 100644 --- a/profiles/arch/amd64/package.use.force +++ b/profiles/arch/amd64/package.use.force @@ -1,6 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Georgy Yakovlev (14 May 2018) +# Force the host target to avoid dependency hell +dev-lang/rust llvm_targets_X86 + # NP-Hardass (23 May 2017) # Packages with optional 64-bit variant app-emulation/wine-vanilla -abi_x86_64 diff --git a/profiles/arch/arm/armv4/make.defaults b/profiles/arch/arm/armv4/make.defaults index 7dede6e9e7d3..75bd5699da21 100644 --- a/profiles/arch/arm/armv4/make.defaults +++ b/profiles/arch/arm/armv4/make.defaults @@ -1,4 +1,6 @@ CHOST="armv4l-unknown-linux-gnu" +CHOST_arm="${CHOST}" + CFLAGS="-O2 -pipe -march=armv4" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" diff --git a/profiles/arch/arm/armv4t/make.defaults b/profiles/arch/arm/armv4t/make.defaults index c99eb3fbd66f..da47bc0c518c 100644 --- a/profiles/arch/arm/armv4t/make.defaults +++ b/profiles/arch/arm/armv4t/make.defaults @@ -1,4 +1,6 @@ CHOST="armv4tl-softfloat-linux-gnueabi" +CHOST_arm="${CHOST}" + CFLAGS="-O2 -pipe -march=armv4t" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" diff --git a/profiles/arch/arm/armv5te/make.defaults b/profiles/arch/arm/armv5te/make.defaults index 4c5a401c2205..f539415059d5 100644 --- a/profiles/arch/arm/armv5te/make.defaults +++ b/profiles/arch/arm/armv5te/make.defaults @@ -1,4 +1,6 @@ CHOST="armv5tel-softfloat-linux-gnueabi" +CHOST_arm="${CHOST}" + CFLAGS="-O2 -pipe -march=armv5te" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" diff --git a/profiles/arch/arm/armv6j/make.defaults b/profiles/arch/arm/armv6j/make.defaults index b85e76c8b446..f23e0de09e37 100644 --- a/profiles/arch/arm/armv6j/make.defaults +++ b/profiles/arch/arm/armv6j/make.defaults @@ -1,4 +1,6 @@ -CHOST="armv6j-hardfloat-linux-gnueabi" +CHOST="armv6j-unknown-linux-gnueabihf" +CHOST_arm="${CHOST}" + CFLAGS="-O2 -pipe -march=armv6j" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" diff --git a/profiles/arch/arm/armv7a/make.defaults b/profiles/arch/arm/armv7a/make.defaults index 2ca07ab4130f..525a73346b19 100644 --- a/profiles/arch/arm/armv7a/make.defaults +++ b/profiles/arch/arm/armv7a/make.defaults @@ -1,4 +1,6 @@ -CHOST="armv7a-hardfloat-linux-gnueabi" +CHOST="armv7a-unknown-linux-gnueabihf" +CHOST_arm="${CHOST}" + CFLAGS="-O2 -pipe -march=armv7-a" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force index 35055867c2fc..31226f273464 100644 --- a/profiles/arch/arm64/package.use.force +++ b/profiles/arch/arm64/package.use.force @@ -1,6 +1,10 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Georgy Yakovlev (14 May 2018) +# Force the host target to avoid dependency hell +dev-lang/rust llvm_targets_AArch64 + # Michał Górny (24 Sep 2016) # Force the host target to avoid dependency hell sys-devel/clang llvm_targets_AArch64 diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask index 406abbd7777a..463a5b3b737f 100644 --- a/profiles/arch/powerpc/ppc32/package.use.mask +++ b/profiles/arch/powerpc/ppc32/package.use.mask @@ -107,7 +107,3 @@ games-fps/duke3d-data gog # Maciej Mrozowski (26 Jun 2010) # Needs media-libs/simage keyworded, bug 325623 media-libs/coin simage - -#nixnut (24 jan 2009) -#don't want zemberek for enchant for ppc32 -app-text/enchant zemberek diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask index d4d81618ef5b..d909bbd691ee 100644 --- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask +++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask @@ -20,7 +20,3 @@ app-admin/conky apcupsd # Brent Baude (6 Feb 2009) # Masking solver/ocaml USE from kalzium to fix tree borkage kde-apps/kalzium solver - -# Brent Baude (28 January 2009) -# Masking zemberek for enchant -app-text/enchant zemberek diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index aa67ba2a5f99..6cb2daaf6398 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -379,9 +379,6 @@ app-text/texlive xindy # Needs krb4 USE flag for mit-krb5 (Bug #255579), and we believe it to be unstable. net-im/pidgin zephyr -# Mask zemberek for enchant because it requires java. -app-text/enchant zemberek - # Mask srtp for ortp because libsrtp is marked -sparc net-libs/ortp srtp diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force index 6d74f7f7c286..c234a241e4f7 100644 --- a/profiles/arch/x86/package.use.force +++ b/profiles/arch/x86/package.use.force @@ -1,6 +1,10 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Georgy Yakovlev (14 May 2018) +# Force the host target to avoid dependency hell +dev-lang/rust llvm_targets_X86 + # Michał Górny (24 Sep 2016) # Force the host target to avoid dependency hell sys-devel/clang llvm_targets_X86 -- cgit v1.2.3