openjdk team mailing list archive

[John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>]

Source: openjdk-9
Version: 9~b170-2
Severity: normal
Tags: patch
User: debian-alpha@xxxxxxxxxxxxxxxx
Usertags: alpha

Hi!

The patch jdk-target-arch-define.diff is still necessary for openjdk-9 as
otherwise the package fails to build from source on alpha (tested) and
sh4 (testing currently in progress).

I am attaching an updated version of the patch, please consider applying it.

Thanks,
Adrian

  .''`.  John Paul Adrian Glaubitz
 : :' :  Debian Developer - glaubitz@xxxxxxxxxx
 `. `'   Freie Universitaet Berlin - glaubitz@xxxxxxxxxxxxxxxxxxx
   `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

--- jdk9/common/autoconf/generated-configure.sh~	2017-05-16 14:14:26.000000000 +0200
+++ jdk9/common/autoconf/generated-configure.sh	2017-06-19 16:00:14.998979413 +0200
@@ -51229,9 +51229,12 @@
   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D$OPENJDK_TARGET_OS_UPPERCASE"
 
   # Setup target CPU
+  case "$OPENJDK_TARGET_CPU_LEGACY" in
+      alpha*|sh*) uscore=_
+  esac
   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
       $OPENJDK_TARGET_ADD_LP64 \
-      -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
+      -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D${uscore}$OPENJDK_TARGET_CPU_LEGACY${uscore}"
 
   # Setup debug/release defines
   if test "x$DEBUG_LEVEL" = xrelease; then