summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2015-08-12 17:03:54 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-08-18 18:54:06 -0300
commitb3cb5cbead26689e6328ff7f5035f19cba3030b6 (patch)
treee174b179a8a5b5d2f61f86cbb6fcb984dc58482f /recipes-core/openjdk
parente07c4666d008f2ec0c0dcfe28f9ea5c7d649f0fe (diff)
downloadmeta-java-b3cb5cbead26689e6328ff7f5035f19cba3030b6.tar.gz
openjdk-7: move "--disable-pulse-java" from common to 75b13 only
The "--disable-pulse-java" configuration is no longer available in IcedTea 2.6.1, therefore move it to the 2.5.4 (75b13) version only. Signed-off-by: Richard Leitner <richard.leitner@skidata.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc1
-rw-r--r--recipes-core/openjdk/openjdk-7-release-75b13.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 837f0b8..5f293df 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -93,7 +93,6 @@ EXTRA_OECONF = " \
93 --disable-hotspot-tests \ 93 --disable-hotspot-tests \
94 --disable-langtools-tests \ 94 --disable-langtools-tests \
95 --disable-jdk-tests \ 95 --disable-jdk-tests \
96 --disable-pulse-java \
97 --disable-docs \ 96 --disable-docs \
98 --disable-nss \ 97 --disable-nss \
99 --disable-system-lcms \ 98 --disable-system-lcms \
diff --git a/recipes-core/openjdk/openjdk-7-release-75b13.inc b/recipes-core/openjdk/openjdk-7-release-75b13.inc
index e60679b..219fd50 100644
--- a/recipes-core/openjdk/openjdk-7-release-75b13.inc
+++ b/recipes-core/openjdk/openjdk-7-release-75b13.inc
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4 4
5FILESPATH =. "${FILE_DIRNAME}/openjdk-7-75b13:" 5FILESPATH =. "${FILE_DIRNAME}/openjdk-7-75b13:"
6 6
7EXTRA_OECONF += " --disable-pulse-java "
8
7# Name of the directory containing the compiled output 9# Name of the directory containing the compiled output
8BUILD_DIR = "openjdk.build" 10BUILD_DIR = "openjdk.build"
9BUILD_DIR_ECJ = "openjdk.build-ecj" 11BUILD_DIR_ECJ = "openjdk.build-ecj"