Date: Sat, 23 Apr 2022 04:09:53 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 263483] [PATCH] Mk/bsd.java.mk: Fix JAVA_VERSION matching Message-ID: <bug-263483-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D263483 Bug ID: 263483 Summary: [PATCH] Mk/bsd.java.mk: Fix JAVA_VERSION matching Product: Ports & Packages Version: Latest Hardware: Any OS: Any Status: New Severity: Affects Only Me Priority: --- Component: Ports Framework Assignee: portmgr@FreeBSD.org Reporter: ashish@FreeBSD.org CC: ports-bugs@FreeBSD.org Created attachment 233411 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D233411&action= =3Dedit Fix As reported to me by jrm, JDK versions matched by JAVA_VERSION=3D17+ is bro= ken. At the moment: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =E2=9D=AF make -C net-im/signal-cli PORTSDIR=3D$(pwd) JAVA_VERSION=3D17+ ja= va-debug # User specified parameters: JAVA_VERSION=3D 17+ (17 8 11 12 13 14 15 16 17 18) JAVA_OS=3D (native linux) JAVA_VENDOR=3D (openjdk oracle) JAVA_BUILD=3D JAVA_RUN=3D jre JAVA_EXTRACT=3D JAVA_DEFAULT=3D 8 # JDK port dependency selection process: _JAVA_PORTS_POSSIBLE=3D JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_11 JAVA_PORT_NATIVE_OPENJDK_JDK_17 JAVA_PORT_NATIVE_OPENJDK_JDK_12 JAVA_PORT_NATIVE_OPENJDK_JDK_13 JAVA_PORT_NATIVE_OPENJDK_JDK_14 JAVA_PORT_NATIVE_OPENJDK_JDK_15 JAVA_PORT_NATIVE_OPENJDK_JDK_16 JAVA_PORT_NATIVE_OPENJDK_JDK_18 JAVA_PORT_LINUX_ORACLE_JDK_8 _JAVA_PORTS_INSTALLED=3D JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_11 JAVA_PORT_NATIVE_OPENJDK_JDK_16 _JAVA_PORTS_INSTALLED_POSSIBLE=3D JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_11 JAVA_PORT_NATIVE_OPENJDK_JDK_16 _JAVA_PORT=3D JAVA_PORT_NATIVE_OPENJDK_JDK_8 _JAVA_PORT_INFO=3D PORT=3Djava/openjdk8 HOME=3D/usr/local/op= enjdk8 VERSION=3D8 OS=3Dnative VENDOR=3Dopenjdk # Selected JDK port: JAVA_PORT=3D java/openjdk8 JAVA_HOME=3D /usr/local/openjdk8 JAVA_PORT_VERSION=3D 8 JAVA_PORT_OS=3D native (Native) JAVA_PORT_VENDOR=3D openjdk (OpenJDK BSD Porting Team) # Additional variables: JAVAC=3D JAVA_CLASSES=3D /usr/local/openjdk8/jre/lib/rt.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Applying the fix: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =E2=9D=AF patch -p1 </tmp/java.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk |index f7eb3fe6192b..34f6522b295a 100644 |--- a/Mk/bsd.java.mk |+++ b/Mk/bsd.java.mk -------------------------- Patching file Mk/bsd.java.mk using Plan A... Hunk #1 succeeded at 285. done =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D After applying the patch: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =E2=9D=AF make -C net-im/signal-cli PORTSDIR=3D$(pwd) JAVA_VERSION=3D17+ ja= va-debug # User specified parameters: JAVA_VERSION=3D 17+ (17 18) JAVA_OS=3D (native linux) JAVA_VENDOR=3D (openjdk oracle) JAVA_BUILD=3D JAVA_RUN=3D jre JAVA_EXTRACT=3D JAVA_DEFAULT=3D 8 # JDK port dependency selection process: _JAVA_PORTS_POSSIBLE=3D JAVA_PORT_NATIVE_OPENJDK_JDK_17 JAVA_PORT_NATIVE_OPENJDK_JDK_18 _JAVA_PORTS_INSTALLED=3D JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_8 JAVA_PORT_NATIVE_OPENJDK_JDK_11 JAVA_PORT_NATIVE_OPENJDK_JDK_16 _JAVA_PORTS_INSTALLED_POSSIBLE=3D _JAVA_PORT=3D JAVA_PORT_NATIVE_OPENJDK_JDK_17 _JAVA_PORT_INFO=3D PORT=3Djava/openjdk17 HOME=3D/usr/local/o= penjdk17 VERSION=3D17 OS=3Dnative VENDOR=3Dopenjdk # Selected JDK port: JAVA_PORT=3D java/openjdk17 JAVA_HOME=3D /usr/local/openjdk17 JAVA_PORT_VERSION=3D 17 JAVA_PORT_OS=3D native (Native) JAVA_PORT_VENDOR=3D openjdk (OpenJDK BSD Porting Team) # Additional variables: JAVAC=3D JAVA_CLASSES=3D /usr/local/openjdk17/jre/lib/rt.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D The attached patch anchors the matching at the beginning of word. Thanks! --=20 You are receiving this mail because: You are on the CC list for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-263483-7788>