Merge pull request #21 from guymers/8u152

Refreshing for 8u152

applyTuxjdk.sh

@@ -26,7 +26,10 @@ sourceSetupEnv() {
 sourceSetupEnv
 
 echo "Applying quilt patches on current folder..."
-if $QUILT push -a
+"$QUILT" push -a
+
+readonly result=$?
+if [ "$result" = 0 ] || [ "$result" = 2 ]
 then
   echo ''
   echo 'Quilt patches applied.'

configureBuildOpenjdk.sh

@@ -22,7 +22,7 @@ fi
 readonly MILESTONE='fcs'
 readonly USER_SUFFIX='tuxjdk'
 readonly PRODUCT_NAME='TuxJdk'
-readonly UPDATE_VERSION='92'
+readonly UPDATE_VERSION='152'
 readonly BUILD_NUMBER='03'
 
 unset JAVA_HOME

docker/Dockerfile

@@ -12,7 +12,7 @@ VOLUME /tmp
 # tuxjdk dependencies:
 RUN zypper --non-interactive --gpg-auto-import-keys update --no-recommends && \
     zypper --non-interactive --gpg-auto-import-keys install --no-recommends \
-    bash which sed xz make gcc5 gcc5-c++ autoconf automake time tar zip unzip \
+    bash which sed xz make gcc gcc-c++ autoconf automake time tar zip unzip \
     freetype2-devel fontconfig-devel alsa-devel cups-devel gtk2-devel libX11-devel \
     libXi-devel libXinerama-devel libXt-devel libXtst-devel site-config \
     ca-certificates ca-certificates-mozilla ca-certificates-cacert quilt fdupes \
@@ -23,7 +23,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys update --no-recommends && \
 
 ## Setup user environment. Replace 1000 with your user / group id.
 RUN \
-  export uid=1024 gid=1024 && \
+  export uid=1000 gid=1000 && \
   groupadd --gid ${gid} builder && \
   useradd --uid ${uid} --gid ${gid} --create-home builder && \
   mkdir /tuxjdk && \

docker/docker-build-static-tuxjdk.sh

@@ -16,7 +16,7 @@ fi
 readonly MILESTONE='fcs'
 readonly USER_SUFFIX='tuxjdk'
 readonly PRODUCT_NAME='TuxJdk'
-readonly UPDATE_VERSION='92'
+readonly UPDATE_VERSION='152'
 readonly BUILD_NUMBER='03'
 
 unset JAVA_HOME
@@ -42,13 +42,6 @@ rm -rf build && mkdir build && cd build
 (
   mkdir building
   cd building
-  ## using gcc5 from Leap 42.1:
-  export CC=gcc-5
-  export CXX=g++-5
-  ## jdk8u45 still does not support linux 4.0 officially,
-  ## so we have to disable os version check because
-  ## tumbleweed already has 4.0-based kernel:
-  export DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
   bash /tuxjdk/build/jdk/configure \
     --disable-debug-symbols \
     --disable-zip-debug-info \

quilt-patches/backport/compare-pointer-with-literal.diff

@@ -1,7 +1,7 @@
-Index: jdk8u92-b14/jdk/src/solaris/native/sun/awt/awt_Font.c
+Index: jdk8u152-b16/jdk/src/solaris/native/sun/awt/awt_Font.c
 ===================================================================
---- jdk8u92-b14.orig/jdk/src/solaris/native/sun/awt/awt_Font.c
-+++ jdk8u92-b14/jdk/src/solaris/native/sun/awt/awt_Font.c
+--- jdk8u152-b16.orig/jdk/src/solaris/native/sun/awt/awt_Font.c
++++ jdk8u152-b16/jdk/src/solaris/native/sun/awt/awt_Font.c
 @@ -502,7 +502,7 @@ awtJNI_GetFontData(JNIEnv * env, jobject
              jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
                           nativename, size * 10);

quilt-patches/backport/less-warnings.diff

@@ -1,26 +1,26 @@
-Index: jdk8u92-b14/common/autoconf/generated-configure.sh
+Index: jdk8u152-b16/common/autoconf/generated-configure.sh
 ===================================================================
---- jdk8u92-b14.orig/common/autoconf/generated-configure.sh
-+++ jdk8u92-b14/common/autoconf/generated-configure.sh
-@@ -29667,7 +29667,7 @@ fi
+--- jdk8u152-b16.orig/common/autoconf/generated-configure.sh
++++ jdk8u152-b16/common/autoconf/generated-configure.sh
+@@ -29731,7 +29731,7 @@ fi
    #
    case $COMPILER_NAME in
      gcc )
--      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
-+      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wno-sign-compare -Wno-deprecated-declarations\
+-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
++      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wno-sign-compare -Wno-deprecated-declarations \
        -pipe \
        -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
-       case $OPENJDK_TARGET_CPU_ARCH in
-Index: jdk8u92-b14/common/autoconf/toolchain.m4
+       CXXSTD_CXXFLAG="-std=gnu++98"
+Index: jdk8u152-b16/common/autoconf/toolchain.m4
 ===================================================================
---- jdk8u92-b14.orig/common/autoconf/toolchain.m4
-+++ jdk8u92-b14/common/autoconf/toolchain.m4
-@@ -957,7 +957,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_
+--- jdk8u152-b16.orig/common/autoconf/toolchain.m4
++++ jdk8u152-b16/common/autoconf/toolchain.m4
+@@ -1018,7 +1018,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_
    #
    case $COMPILER_NAME in
      gcc )
--      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
-+      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wno-sign-compare -Wno-deprecated-declarations\
+-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
++      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wno-sign-compare -Wno-deprecated-declarations \
        -pipe \
        -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
-       case $OPENJDK_TARGET_CPU_ARCH in
+       CXXSTD_CXXFLAG="-std=gnu++98"

quilt-patches/backport/opensuse-link-zlib-as-needed.diff

@@ -1,7 +1,7 @@
-Index: jdk8u92-b14/jdk/make/CompileLaunchers.gmk
+Index: jdk8u152-b16/jdk/make/CompileLaunchers.gmk
 ===================================================================
---- jdk8u92-b14.orig/jdk/make/CompileLaunchers.gmk
-+++ jdk8u92-b14/jdk/make/CompileLaunchers.gmk
+--- jdk8u152-b16.orig/jdk/make/CompileLaunchers.gmk
++++ jdk8u152-b16/jdk/make/CompileLaunchers.gmk
 @@ -427,7 +427,7 @@ endif
  # binary (at least on linux) which causes the size to differ between old and new build.
  ifeq ($(USE_EXTERNAL_LIBZ), true)

quilt-patches/tune/default-gc.diff

@@ -1,8 +1,8 @@
-Index: jdk8u92-b14/hotspot/src/share/vm/runtime/arguments.cpp
+Index: jdk8u152-b16/hotspot/src/share/vm/runtime/arguments.cpp
 ===================================================================
---- jdk8u92-b14.orig/hotspot/src/share/vm/runtime/arguments.cpp
-+++ jdk8u92-b14/hotspot/src/share/vm/runtime/arguments.cpp
-@@ -1568,11 +1568,7 @@ void Arguments::set_conservative_max_hea
+--- jdk8u152-b16.orig/hotspot/src/share/vm/runtime/arguments.cpp
++++ jdk8u152-b16/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -1572,11 +1572,7 @@ void Arguments::set_conservative_max_hea
 
  void Arguments::select_gc_ergonomically() {
    if (os::is_server_class_machine()) {

quilt-patches/tune/empty-ctsym.diff

@@ -1,7 +1,7 @@
-Index: jdk8u92-b14/jdk/make/CreateJars.gmk
+Index: jdk8u152-b16/jdk/make/CreateJars.gmk
 ===================================================================
---- jdk8u92-b14.orig/jdk/make/CreateJars.gmk
-+++ jdk8u92-b14/jdk/make/CreateJars.gmk
+--- jdk8u152-b16.orig/jdk/make/CreateJars.gmk
++++ jdk8u152-b16/jdk/make/CreateJars.gmk
 @@ -556,26 +556,7 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swi
  EXPORTED_PRIVATE_PKGS = com.oracle.net \
      com.oracle.nio

quilt-patches/tune/full-srczip.diff

@@ -1,7 +1,7 @@
-Index: jdk8u92-b14/jdk/make/CreateJars.gmk
+Index: jdk8u152-b16/jdk/make/CreateJars.gmk
 ===================================================================
---- jdk8u92-b14.orig/jdk/make/CreateJars.gmk
-+++ jdk8u92-b14/jdk/make/CreateJars.gmk
+--- jdk8u152-b16.orig/jdk/make/CreateJars.gmk
++++ jdk8u152-b16/jdk/make/CreateJars.gmk
 @@ -580,38 +580,12 @@ $(eval $(call SetupArchive,BUILD_CT_SYM,
  ##########################################################################################
 

quilt-patches/tuxjdk/add-fontconfig-support.diff

@@ -1,7 +1,7 @@
-Index: jdk8u92-b14/jdk/make/lib/Awt2dLibraries.gmk
+Index: jdk8u152-b16/jdk/make/lib/Awt2dLibraries.gmk
 ===================================================================
---- jdk8u92-b14.orig/jdk/make/lib/Awt2dLibraries.gmk
-+++ jdk8u92-b14/jdk/make/lib/Awt2dLibraries.gmk
+--- jdk8u152-b16.orig/jdk/make/lib/Awt2dLibraries.gmk
++++ jdk8u152-b16/jdk/make/lib/Awt2dLibraries.gmk
 @@ -921,7 +921,7 @@ $(eval $(call SetupNativeCompilation,BUI
      LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -11,10 +11,10 @@ Index: jdk8u92-b14/jdk/make/lib/Awt2dLibraries.gmk
      LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
      LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
      LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
-Index: jdk8u92-b14/jdk/src/share/native/sun/font/freetypeScaler.c
+Index: jdk8u152-b16/jdk/src/share/native/sun/font/freetypeScaler.c
 ===================================================================
---- jdk8u92-b14.orig/jdk/src/share/native/sun/font/freetypeScaler.c
-+++ jdk8u92-b14/jdk/src/share/native/sun/font/freetypeScaler.c
+--- jdk8u152-b16.orig/jdk/src/share/native/sun/font/freetypeScaler.c
++++ jdk8u152-b16/jdk/src/share/native/sun/font/freetypeScaler.c
 @@ -38,6 +38,10 @@
  #include FT_SIZES_H
  #include FT_OUTLINE_H

quilt-patches/tuxjdk/change-vendor.diff

@@ -1,8 +1,8 @@
-Index: jdk8u92-b14/jdk/src/share/native/java/lang/System.c
+Index: jdk8u152-b16/jdk/src/share/native/java/lang/System.c
 ===================================================================
---- jdk8u92-b14.orig/jdk/src/share/native/java/lang/System.c
-+++ jdk8u92-b14/jdk/src/share/native/java/lang/System.c
-@@ -97,9 +97,9 @@ Java_java_lang_System_identityHashCode(J
+--- jdk8u152-b16.orig/jdk/src/share/native/java/lang/System.c
++++ jdk8u152-b16/jdk/src/share/native/java/lang/System.c
+@@ -109,9 +109,9 @@ Java_java_lang_System_identityHashCode(J
      } else ((void) 0)
 
  #ifndef VENDOR /* Third party may overwrite this. */