From c60981a4b9ee082ce4217c04013b22031238d1ec Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 9 Jan 2016 22:56:18 +0000 Subject: [PATCH] profiles: Mask Java 8 virtuals on pre-armv6 to fix tree breakage --- profiles/arch/arm/armv6j/package.mask | 5 +++++ profiles/arch/arm/armv7a/package.mask | 5 +++++ profiles/arch/arm/package.mask | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask index fba35e2f0be7..1302a9201232 100644 --- a/profiles/arch/arm/armv6j/package.mask +++ b/profiles/arch/arm/armv6j/package.mask @@ -2,6 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# James Le Cuirot (09 Jan 2016) +# Unmask against the wider arm mask. +-virtual/jdk:1.8 +-virtual/jre:1.8 + # James Le Cuirot (09 Jan 2016) # This is built for armv6 so unmask against the wider arm mask. -dev-java/oracle-jdk-bin diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask index 56e83609e5dd..15027689b1c8 100644 --- a/profiles/arch/arm/armv7a/package.mask +++ b/profiles/arch/arm/armv7a/package.mask @@ -2,6 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# James Le Cuirot (09 Jan 2016) +# Unmask against the wider arm mask. +-virtual/jdk:1.8 +-virtual/jre:1.8 + # James Le Cuirot (09 Jan 2016) # This is built for armv6 so unmask against the wider arm mask. -dev-java/oracle-jdk-bin diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask index ff6f86039d03..c0178249e536 100644 --- a/profiles/arch/arm/package.mask +++ b/profiles/arch/arm/package.mask @@ -2,6 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# James Le Cuirot (09 Jan 2016) +# There are no providers for Java 8 on pre-armv6. icedtea 3 may work +# but we don't have it in the tree yet. +virtual/jdk:1.8 +virtual/jre:1.8 + # James Le Cuirot (09 Jan 2016) # This is built for armv6 and will not work on earlier generations. dev-java/oracle-jdk-bin -- 2.26.2