From d2261c6640e90f8cf2762a0733fc6534ab1f222d Mon Sep 17 00:00:00 2001
From: Alexander Pyhalov <apyhalov@gmail.com>
Date: Mon, 18 Jul 2016 21:53:50 +0200
Subject: [PATCH] Make OpenJDK 7 links mediated
---
components/runtime/openjdk-7/openjdk7-jdk.p5m | 28 +++++++-------
components/runtime/openjdk-7/Makefile | 18 ++++++++
components/runtime/openjdk-7/openjdk7-runtime.p5m | 19 ++++-----
transforms/defaults | 5 ++
4 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/components/runtime/openjdk-7/Makefile b/components/runtime/openjdk-7/Makefile
index 79e89fc..a0e3564 100644
--- a/components/runtime/openjdk-7/Makefile
+++ b/components/runtime/openjdk-7/Makefile
@@ -19,7 +19,7 @@
OPENJDK_BUILD_NUMBER=80
COMPONENT_VERSION=1.7.$(OPENJDK_BUILD_NUMBER)
-COMPONENT_REVISION=2
+COMPONENT_REVISION=3
COMPONENT_SUMMARY= Open-source implementation of the Java Platform, Standard Edition
COMPONENT_SRC= openjdk
COMPONENT_ARCHIVE= openjdk-$(COMPONENT_VERSION)-20150609.tar.xz
@@ -116,3 +116,19 @@
install: $(INSTALL_32_and_64)
.NOTPARALLEL:
+
+REQUIRED_PACKAGES += SUNWcs
+REQUIRED_PACKAGES += developer/java/openjdk7
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/java/openjdk7
+REQUIRED_PACKAGES += runtime/java/openjdk7/runtime64
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/freetype-2
+REQUIRED_PACKAGES += system/library/g++-4-runtime
+REQUIRED_PACKAGES += system/library/gcc-4-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxext
+REQUIRED_PACKAGES += x11/library/libxi
+REQUIRED_PACKAGES += x11/library/libxrender
+REQUIRED_PACKAGES += x11/library/libxtst
diff --git a/components/runtime/openjdk-7/openjdk7-jdk.p5m b/components/runtime/openjdk-7/openjdk7-jdk.p5m
index ed9f742..2d65621 100644
--- a/components/runtime/openjdk-7/openjdk7-jdk.p5m
+++ b/components/runtime/openjdk-7/openjdk7-jdk.p5m
@@ -22,20 +22,20 @@
license openjdk.license license="GPLv2 with Classpath Exception"
-link path=usr/bin/appletviewer target=../java/bin/appletviewer pkg.linted.userland.action002.0=true
-link path=usr/bin/apt target=../java/bin/apt pkg.linted.userland.action002.0=true
-link path=usr/bin/extcheck target=../java/bin/extcheck pkg.linted.userland.action002.0=true
-link path=usr/bin/idlj target=../java/bin/idlj pkg.linted.userland.action002.0=true
-link path=usr/bin/jar target=../java/bin/jar pkg.linted.userland.action002.0=true
-link path=usr/bin/jarsigner target=../java/bin/jarsigner pkg.linted.userland.action002.0=true
-link path=usr/bin/javac target=../java/bin/javac pkg.linted.userland.action002.0=true
-link path=usr/bin/javadoc target=../java/bin/javadoc pkg.linted.userland.action002.0=true
-link path=usr/bin/javah target=../java/bin/javah pkg.linted.userland.action002.0=true
-link path=usr/bin/javap target=../java/bin/javap pkg.linted.userland.action002.0=true
-link path=usr/bin/jdb target=../java/bin/jdb pkg.linted.userland.action002.0=true
-link path=usr/bin/native2ascii target=../java/bin/native2ascii pkg.linted.userland.action002.0=true
-link path=usr/bin/rmic target=../java/bin/rmic pkg.linted.userland.action002.0=true
-link path=usr/bin/serialver target=../java/bin/serialver pkg.linted.userland.action002.0=true
+link path=usr/bin/appletviewer target=../jdk/instances/openjdk1.7.0/bin/appletviewer mediator=java mediator-version=7
+link path=usr/bin/apt target=../jdk/instances/openjdk1.7.0/bin/apt mediator=java mediator-version=7
+link path=usr/bin/extcheck target=../jdk/instances/openjdk1.7.0/bin/extcheck mediator=java mediator-version=7
+link path=usr/bin/idlj target=../jdk/instances/openjdk1.7.0/bin/idlj mediator=java mediator-version=7
+link path=usr/bin/jar target=../jdk/instances/openjdk1.7.0/bin/jar mediator=java mediator-version=7
+link path=usr/bin/jarsigner target=../jdk/instances/openjdk1.7.0/bin/jarsigner mediator=java mediator-version=7
+link path=usr/bin/javac target=../jdk/instances/openjdk1.7.0/bin/javac mediator=java mediator-version=7
+link path=usr/bin/javadoc target=../jdk/instances/openjdk1.7.0/bin/javadoc mediator=java mediator-version=7
+link path=usr/bin/javah target=../jdk/instances/openjdk1.7.0/bin/javah mediator=java mediator-version=7
+link path=usr/bin/javap target=../jdk/instances/openjdk1.7.0/bin/javap mediator=java mediator-version=7
+link path=usr/bin/jdb target=../jdk/instances/openjdk1.7.0/bin/jdb mediator=java mediator-version=7
+link path=usr/bin/native2ascii target=../jdk/instances/openjdk1.7.0/bin/native2ascii mediator=java mediator-version=7
+link path=usr/bin/rmic target=../jdk/instances/openjdk1.7.0/bin/rmic mediator=java mediator-version=7
+link path=usr/bin/serialver target=../jdk/instances/openjdk1.7.0/bin/serialver mediator=java mediator-version=7
# Generated section:
file path=usr/jdk/instances/openjdk1.7.0/bin/appletviewer mode=0555
diff --git a/components/runtime/openjdk-7/openjdk7-runtime.p5m b/components/runtime/openjdk-7/openjdk7-runtime.p5m
index 3d92bb2..3a86969 100644
--- a/components/runtime/openjdk-7/openjdk7-runtime.p5m
+++ b/components/runtime/openjdk-7/openjdk7-runtime.p5m
@@ -30,16 +30,15 @@
dir path=usr/jdk/instances/openjdk1.7.0
link path=usr/jdk/openjdk1.7.0 target=instances/openjdk1.7.0
-link path=usr/bin/java target=../java/bin/java pkg.linted.userland.action002.0=true
-link path=usr/bin/keytool target=../java/bin/keytool pkg.linted.userland.action002.0=true
-link path=usr/bin/orbd target=../java/bin/orbd pkg.linted.userland.action002.0=true
-link path=usr/bin/policytool target=../java/bin/policytool pkg.linted.userland.action002.0=true
-link path=usr/bin/rmid target=../java/bin/rmid pkg.linted.userland.action002.0=true
-link path=usr/bin/rmiregistry target=../java/bin/rmiregistry pkg.linted.userland.action002.0=true
-link path=usr/bin/servertool target=../java/bin/servertool pkg.linted.userland.action002.0=true
-link path=usr/bin/tnameserv target=../java/bin/tnameserv pkg.linted.userland.action002.0=true
-link path=usr/java target=jdk/openjdk1.7.0 pkg.linted.userland.action002.0=true
-link path=usr/jdk/latest target=openjdk1.7.0 pkg.linted.userland.action002.0=true
+link path=usr/bin/java target=../jdk/instances/openjdk1.7.0/bin/java mediator=java mediator-version=7
+link path=usr/bin/keytool target=../jdk/instances/openjdk1.7.0/bin/keytool mediator=java mediator-version=7
+link path=usr/bin/orbd target=../jdk/instances/openjdk1.7.0/bin/orbd mediator=java mediator-version=7
+link path=usr/bin/policytool target=../jdk/instances/openjdk1.7.0/bin/policytool mediator=java mediator-version=7
+link path=usr/bin/rmid target=../jdk/instances/openjdk1.7.0/bin/rmid mediator=java mediator-version=7
+link path=usr/bin/rmiregistry target=../jdk/instances/openjdk1.7.0/bin/rmiregistry mediator=java mediator-version=7
+link path=usr/bin/servertool target=../jdk/instances/openjdk1.7.0/bin/servertool mediator=java mediator-version=7
+link path=usr/bin/tnameserv target=../jdk/instances/openjdk1.7.0/bin/tnameserv mediator=java mediator-version=7
+link path=usr/java target=jdk/openjdk1.7.0 mediator=java mediator-version=7
# Generated section:
file path=usr/jdk/instances/openjdk1.7.0/bin/java mode=0555
diff --git a/transforms/defaults b/transforms/defaults
index 48724ce..2b6b991 100644
--- a/transforms/defaults
+++ b/transforms/defaults
@@ -151,6 +151,11 @@
<transform link mediator=ruby mediator-version=1.9 -> default mediator-priority vendor>
#
+# Set the default Java for mediated links
+#
+<transform link mediator=java mediator-version=7 -> default mediator-priority vendor>
+
+#
# Add a facet.version-lock.{package} to each 'optional' consolidation
# incorporation dependency so that we can install without having to
# mangle the system in some way.
--
Gitblit v1.9.3