8211130: Change to Oracle Developer Studio 12.6 for building on Solaris at Oracle
Reviewed-by: tbell, prr, ihse
--- a/make/conf/jib-profiles.js Wed Sep 26 06:28:48 2018 -0700
+++ b/make/conf/jib-profiles.js Thu Sep 27 08:49:12 2018 -0700
@@ -840,7 +840,7 @@
linux_x64: "gcc7.3.0-OEL6.4+1.0",
macosx_x64: "Xcode9.4-MacOSX10.13+1.0",
solaris_x64: "SS12u4-Solaris11u1+1.0",
- solaris_sparcv9: "SS12u4-Solaris11u1+1.1",
+ solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
windows_x64: "VS2017-15.5.5+1.0",
linux_aarch64: (input.profile != null && input.profile.indexOf("arm64") >= 0
? "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0"
--- a/make/devkit/createSolarisDevkit12.6.sh Wed Sep 26 06:28:48 2018 -0700
+++ b/make/devkit/createSolarisDevkit12.6.sh Thu Sep 27 08:49:12 2018 -0700
@@ -34,18 +34,19 @@
# install in a separate temporary image.
#
# The Solaris Studio installation must contain at least these packages:
-# developer/developerstudio-126/backend 12.6-1.0.0.0 i--
-# developer/developerstudio-126/c++ 12.6-1.0.0.0 i--
-# developer/developerstudio-126/cc 12.6-1.0.0.0 i--
-# developer/developerstudio-126/dbx (solarisstudio) 12.6-1.0.0.0 i--
-# developer/developerstudio-126/library/c++-libs 12.6-1.0.0.0 i--
-# developer/developerstudio-126/library/math-libs 12.6-1.0.0.0 i--
-# developer/developerstudio-126/library/c-libs 12.6-1.0.0.0 i--
-# developer/developerstudio-126/library/studio-gccrt 12.6-1.0.0.0 i--
-# developer/developerstudio-126/studio-common 12.6-1.0.0.0 i--
-# developer/developerstudio-126/studio-ja 12.6-1.0.0.0 i--
-# developer/developerstudio-126/studio-legal 12.6-1.0.0.0 i--
-# developer/developerstudio-126/studio-zhCN 12.6-1.0.0.0 i--
+#developer/developerstudio-126/backend 12.6-1.0.0.1
+#developer/developerstudio-126/c++ 12.6-1.0.2.0
+#developer/developerstudio-126/cc 12.6-1.0.1.0
+#developer/developerstudio-126/dbx 12.6-1.0.0.1
+#developer/developerstudio-126/library/c++-libs 12.6-1.0.2.0
+#developer/developerstudio-126/library/c-libs 12.6-1.0.0.1
+#developer/developerstudio-126/library/f90-libs 12.6-1.0.0.1
+#developer/developerstudio-126/library/math-libs 12.6-1.0.0.1
+#developer/developerstudio-126/library/studio-gccrt 12.6-1.0.0.1
+#developer/developerstudio-126/studio-common 12.6-1.0.0.1
+#developer/developerstudio-126/studio-ja 12.6-1.0.0.1
+#developer/developerstudio-126/studio-legal 12.6-1.0.0.1
+#developer/developerstudio-126/studio-zhCN 12.6-1.0.0.1
#
# erik.joelsson@oracle.com
@@ -93,7 +94,7 @@
pkg -R $INSTALL_ROOT set-publisher -P -g ${PUBLISHER_URI} solaris
sudo pkg -R $INSTALL_ROOT install --accept entire@$SOLARIS_ENTIRE_VERSION \
system/install developer/gnu-binutils system/library/mmheap system/picl \
- developer/assembler
+ developer/assembler system/library/freetype-2
else
echo "Skipping installing packages"
fi