[arch-commits] Commit in java10-openjdk/trunk (3 files)

[Levente Polyak]

    Date: Tuesday, June 18, 2019 @ 05:09:19
  Author: anthraxx
Revision: 356348

upgpkg: java10-openjdk 10.0.2.u13-1

Modified:
  java10-openjdk/trunk/PKGBUILD
  java10-openjdk/trunk/install_jre10-openjdk-headless.sh
Deleted:
  java10-openjdk/trunk/freedesktop-policytool.desktop

-----------------------------------+
 PKGBUILD                          |   24 ++++++++++++------------
 freedesktop-policytool.desktop    |   13 -------------
 install_jre10-openjdk-headless.sh |    2 +-
 3 files changed, 13 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-18 05:07:51 UTC (rev 356347)
+++ PKGBUILD	2019-06-18 05:09:19 UTC (rev 356348)
@@ -30,12 +30,10 @@
 source=(http://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
-        freedesktop-policytool.desktop
         freedesktop-jshell.desktop)
 sha256sums=('f34a53b049f2e3ee8d954998687c4a48b56f24efbb2738ae7fe81bbbdff7f078'
             '819e6ca314641c3115566f9478fbd8671f5d884a3d4e65f05950b4bd2d3b8451'
             '5276edf203e5a75607c55b8bd4ae4f76cf61360811190286829c66d0c4b06554'
-            '7f3bc3e424b6d8bac403eb336d81524680f347300c233400222a3850f937c659'
             '0bcdb1eb9640775ca61e87ffeb9b0e0f99386b41f51fec753688bdd5ff9b6010')
 
 case "${CARCH}" in
@@ -64,9 +62,10 @@
     NUM_PROC_OPT="--with-num-cores=${MAKEFLAG_J}"
   fi
 
-  _CFLAGS="${CFLAGS} ${CPPFLAGS}"
-  _CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}"
-  _LDFLAGS=${LDFLAGS}
+  # Avoid optimization of HotSpot being lowered from O3 to O2
+  local _CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS}"
+  local _CXXFLAGS="${CXXFLAGS//-O2/-O3} ${CPPFLAGS}"
+  local _LDFLAGS=${LDFLAGS}
   if [[ ${CARCH} = i686 ]]; then
     echo "Removing '-fno-plt' from CFLAGS and CXXFLAGS to prevent build fail with this architecture"
     _CFLAGS=${CFLAGS/-fno-plt/}
@@ -107,10 +106,11 @@
   find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \;
 }
 
-# check() {
-#   cd "${pkgname}-${pkgver}"
-#   make -k check
-# }
+check() {
+  cd ${_jdkdir}
+  #make -k check
+  #make run-test-tier1
+}
 
 package_jre10-openjdk-headless() {
   pkgdesc="OpenJDK Java ${_majorver} headless runtime environment"
@@ -141,7 +141,7 @@
   cp -a bin lib \
     "${pkgdir}${_jvmdir}"
 
-  for f in ${_nonheadless[@]}; do
+  for f in "${_nonheadless[@]}"; do
     rm "${pkgdir}${_jvmdir}/${f}"
   done
 
@@ -184,7 +184,7 @@
 
   install -dm 755 "${pkgdir}${_jvmdir}"
 
-  for f in ${_nonheadless[@]}; do
+  for f in "${_nonheadless[@]}"; do
     install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}"
   done
 
@@ -243,7 +243,7 @@
   done
 
   # Desktop files
-  for f in jconsole policytool java jshell; do
+  for f in jconsole java jshell; do
     install -Dm 644 \
       "${srcdir}/freedesktop-${f}.desktop" \
       "${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop"

Deleted: freedesktop-policytool.desktop
===================================================================
--- freedesktop-policytool.desktop	2019-06-18 05:07:51 UTC (rev 356347)
+++ freedesktop-policytool.desktop	2019-06-18 05:09:19 UTC (rev 356348)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Java 10 Policy Tool
-Name[fi]=OpenJDK Java 10 - käytäntötyökalu
-Name[fr]=OpenJDK Java 10 - Outil de réglage
-Comment=OpenJDK Java 10 Policy Tool
-Comment[fi]=OpenJDK Java 10 - käytäntötyökalu
-Comment[fr]=OpenJDK Java 10 - Outil de réglage
-Keywords=java;security;policytool
-Exec=/usr/lib/jvm/java-10-openjdk/bin/policytool
-Terminal=false
-Type=Application
-Icon=java10-openjdk
-Categories=Settings;

Modified: install_jre10-openjdk-headless.sh
===================================================================
--- install_jre10-openjdk-headless.sh	2019-06-18 05:07:51 UTC (rev 356347)
+++ install_jre10-openjdk-headless.sh	2019-06-18 05:09:19 UTC (rev 356348)
@@ -25,7 +25,7 @@
   esac
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-     /usr/bin/update-ca-trust
+    /usr/bin/update-ca-trust
   fi
 }