Date: Tue, 3 Sep 2024 14:34:57 GMT From: Ronald Klop <ronald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 014e6556ac4c - main - sysutils/facter: support openjdk11 and up Message-ID: <202409031434.483EYv7e036722@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=014e6556ac4c6b96e441337c792020ca90180ec1 commit 014e6556ac4c6b96e441337c792020ca90180ec1 Author: Ronald Klop <ronald@FreeBSD.org> AuthorDate: 2024-09-03 14:27:28 +0000 Commit: Ronald Klop <ronald@FreeBSD.org> CommitDate: 2024-09-03 14:34:25 +0000 sysutils/facter: support openjdk11 and up Adjusted the patch from the issue to target jdk 8 instead of 7. Target 8 is supported by all current openjdk version in ports. PR: 237990 Tested by: poudriere Approved by: maintainer timeout --- sysutils/facter/Makefile | 2 +- sysutils/facter/files/patch-CMakeLists.txt | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index b834570b48df..5eec488bb1c5 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -1,6 +1,6 @@ PORTNAME= facter PORTVERSION= 3.14.24 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= sysutils MASTER_SITES= https://downloads.puppetlabs.com/facter/ diff --git a/sysutils/facter/files/patch-CMakeLists.txt b/sysutils/facter/files/patch-CMakeLists.txt index 246444a7eb8c..05e68a065e7d 100644 --- a/sysutils/facter/files/patch-CMakeLists.txt +++ b/sysutils/facter/files/patch-CMakeLists.txt @@ -1,6 +1,15 @@ ---- CMakeLists.txt.orig 2024-02-25 16:48:32 UTC +--- CMakeLists.txt.orig 2022-07-18 15:00:22 UTC +++ CMakeLists.txt -@@ -233,7 +233,7 @@ add_test(NAME "facter\\ smoke" COMMAND facter) +@@ -121,7 +121,7 @@ if (NOT WITHOUT_JRUBY AND NOT WIN32) + + if (Java_JAVAC_EXECUTABLE) + set(JRUBY_SUPPORT TRUE) +- set(CMAKE_JAVA_COMPILE_FLAGS -source 1.6 -target 1.6) ++ set(CMAKE_JAVA_COMPILE_FLAGS -source 8 -target 8) + add_definitions(-DUSE_JRUBY_SUPPORT) + endif() + endif() +@@ -233,7 +233,7 @@ endif() add_test(NAME "facter\\ smoke" COMMAND facter) # Install the man page
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409031434.483EYv7e036722>