openjdk8: update to 1.8.432-06

omniosorg · Nov 16, 2024 · 6ae7eda · 6ae7eda
1 parent d15f486
commit 6ae7eda
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/build/openjdk8/build.sh b/build/openjdk8/build.sh
@@ -18,8 +18,8 @@
 
 PROG=openjdk
 VER=1.8
-UPDATE=422
-BUILD=05
+UPDATE=432
+BUILD=06
 PKG=openjdk    ##IGNORE## - filled in later
 SUMMARY="tbc"; DESC="tbc"
 
@@ -104,6 +104,7 @@ MAKE_ARGS="
     FULL_DEBUG_SYMBOLS=0
     ENABLE_FULL_DEBUG_SYMBOLS=0
     NO_DOCS=1
+    X_CFLAGS=-I$OOCEPREFIX/include
 "
 
 export PATH=$GNUBIN:$PATH

diff --git a/build/openjdk8/patches/patch-common_autoconf_generated-configure.sh.patch b/build/openjdk8/patches/patch-common_autoconf_generated-configure.sh.patch
@@ -1,7 +1,7 @@
-diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/common/autoconf/generated-configure.sh
+diff -wpruN '--exclude=*.orig' a~/common/autoconf/generated-configure.sh a/common/autoconf/generated-configure.sh
 --- a~/common/autoconf/generated-configure.sh	1970-01-01 00:00:00
 +++ a/common/autoconf/generated-configure.sh	1970-01-01 00:00:00
-@@ -4183,7 +4183,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
+@@ -4187,7 +4187,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
 
  # These toolchains are valid on different platforms
  VALID_TOOLCHAINS_linux="gcc clang"
@@ -10,15 +10,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/generated-con
  VALID_TOOLCHAINS_macosx="gcc clang"
  VALID_TOOLCHAINS_aix="xlc"
  VALID_TOOLCHAINS_windows="microsoft"
-@@ -25617,6 +25617,7 @@ $as_echo_n "checking flags for boot jdk
-     JVM_MAX_HEAP=1600M
-     STACK_SIZE=1536
-   fi
-+  JVM_MAX_HEAP=800M
-
-   $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
-   $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
-@@ -42432,6 +42433,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42442,6 +42442,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
        SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
        SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
        SET_SHARED_LIBRARY_MAPFILE=''
@@ -33,7 +25,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/generated-con
      else
        # Default works for linux, might work on other platforms as well.
        SHARED_LIBRARY_FLAGS='-shared'
-@@ -42500,11 +42509,6 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42510,11 +42518,6 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
 
 
 
@@ -45,7 +37,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/generated-con
    # The (cross) compiler is now configured, we can now test capabilities
    # of the target platform.
 
-@@ -42603,6 +42607,11 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42613,6 +42616,11 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
          C_O_FLAG_HI="-Os"
          C_O_FLAG_NORM="-Os"
          C_O_FLAG_NONE=""
@@ -57,20 +49,25 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/generated-con
        else
          C_O_FLAG_HIGHEST="-O3"
          C_O_FLAG_HI="-O3"
-@@ -42661,9 +42670,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42671,12 +42679,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
      CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
      CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
    elif test "x$TOOLCHAIN_TYPE" = xgcc; then
--    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
--    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
+-    LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS -fstack-protector"
+-    LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS -fstack-protector"
+-    LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS -fstack-protector"
+-    LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS -fstack-protector"
 -    if test "x$OPENJDK_TARGET_OS" != xmacosx; then
-+    #LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
-+    #LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
++    #LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS -fstack-protector"
++    #LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS -fstack-protector"
++    #LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS -fstack-protector"
++    #LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS -fstack-protector"
 +    if test "x$OPENJDK_TARGET_OS" != xsolaris; then
        LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
-       LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
+       LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS -Wl,-z,relro"
+       LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS -Wl,-z,relro"
      fi
-@@ -42788,7 +42797,7 @@ fi
+@@ -42809,7 +42817,7 @@ fi
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
      # these options are used for both C and C++ compiles
      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
@@ -79,7 +76,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/generated-con
      case $OPENJDK_TARGET_CPU_ARCH in
        arm )
          # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
-@@ -44789,11 +44798,8 @@ fi
+@@ -44810,11 +44818,6 @@ fi
 
    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
      OPENWIN_HOME="/usr/openwin"
@@ -88,12 +85,10 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/common/autoconf/generated-con
 -        -L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
 -        -R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
 -        -R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
-+    X_CFLAGS="-I$x_includes"
-+    X_LIBS="-L$x_libraries -R$x_libraries"
    fi
 
    #
-@@ -49120,7 +49126,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -49141,7 +49144,7 @@ $as_echo "$as_me: The path of FREETYPE_L
        if test "x$OPENJDK_TARGET_OS" = xwindows; then
          FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
        else