[Bug 255905] java/openjdk16: Fix compile error with clang 12

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255905

            Bug ID: 255905
           Summary: java/openjdk16: Fix compile error with clang 12
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: Individual Port(s)
          Assignee: java at FreeBSD.org
          Reporter: dim at FreeBSD.org
          Assignee: java at FreeBSD.org
             Flags: maintainer-feedback?(java at FreeBSD.org)

Created attachment 224972
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=224972&action=edit
Fix java/openjdk16 build with clang 12

During an exp-run for llvm 12 (see bug 255570), it turned out that at least
openjdk11 and openjdk12 do not build with clang 12.0.0. The exp-run therefore
skipped openjdk16.

Building this manually shows that it results in a compile error:

gmake[4]: Leaving directory
'/wrkdirs/share/dim/ports/java/openjdk16/work/jdk16u-jdk-16.0.1-9-1/make'
/wrkdirs/share/dim/ports/java/openjdk16/work/jdk16u-jdk-16.0.1-9-1/src/hotspot/cpu/x86/vm_version_ext_x86.cpp:748:3:
error: suspicious concatenation of string literals in an array initialization;
did you mean to separate the elements with a comma?
[-Werror,-Wstring-concatenation]
  "",
  ^
/wrkdirs/share/dim/ports/java/openjdk16/work/jdk16u-jdk-16.0.1-9-1/src/hotspot/cpu/x86/vm_version_ext_x86.cpp:747:3:
note: place parentheses around the string literal to silence warning
  "Opteron QC/Phenom"  // Barcelona et.al.
  ^
1 error generated.

This is due to a missing backport of this commit [1]:

commit f8a9602a0a65cdc98eb940aac9529256ded2bf42
Author: Yasumasa Suenaga <ysuenaga at openjdk.org>
Date:   Thu Jan 21 06:08:13 2021 +0000

    8260025: Missing comma in VM_Version_Ext::_family_id_amd

    Reviewed-by: dholmes, stuefe

I have attached a patch that adds this commits as an additional patch.

[1]
https://github.com/openjdk/jdk/commit/f8a9602a0a65cdc98eb940aac9529256ded2bf42

-- 
You are receiving this mail because:
You are the assignee for the bug.