From 2214b6a32c175287031bcfc0e7941ae54fbfe502 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 12 Jan 2020 12:47:53 +0000 Subject: [PATCH] databases/db6, db5: fix JAVA-enabled build, suppress sed failed warnings Add JAVA_VERSION="7 8" to db6 Add REWARNFILE=/dev/null to db6 and db5 Reported by: Tommy P PR: 243278 MFH: 2020Q1 (blanket, fix broken build) --- databases/db5/Makefile | 3 +++ databases/db6/Makefile | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/databases/db5/Makefile b/databases/db5/Makefile index 03742489f772..27b928dd5376 100644 --- a/databases/db5/Makefile +++ b/databases/db5/Makefile @@ -38,6 +38,9 @@ USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} MAKE_ARGS+= docdir=${DOCSDIR} CFLAGS+= -Wall -Wextra +# we use REINPLACE_CMD with a glob that matches +# too broadly, suppress 'sed failed' warnings: +REWARNFILE= /dev/null OPTIONS_DEFINE= CRYPTO DEBUG L10N SQL JAVA TCL DOCS OPTIONS_DEFAULT=CRYPTO diff --git a/databases/db6/Makefile b/databases/db6/Makefile index ca597a31ecf4..7a9acd423e40 100644 --- a/databases/db6/Makefile +++ b/databases/db6/Makefile @@ -36,6 +36,9 @@ PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} MAKE_ARGS+= docdir=${DOCSDIR} +# we use REINPLACE_CMD with a glob that matches +# too broadly, suppress 'sed failed' warnings: +REWARNFILE= /dev/null OPTIONS_DEFINE= CRYPTO DEBUG L10N SQL JAVA TCL DOCS OPTIONS_DEFAULT=CRYPTO @@ -54,7 +57,11 @@ L10N_CONFIGURE_ENABLE= localization SQL_CONFIGURE_ENABLE= sql sql_codegen SQL_VARS= DBLIBS+=libdb_sql JAVA_USE= java -JAVA_VARS= DBLIBS+=libdb_java +# db6 is only compatible with openjdk 7 or 8, +# openjdk 11 or newer and cause IllegalArgument +# exceptions during build even if the version check +# in dist/configure is disabled or fixed: +JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION="7 8" JAVA_CONFIGURE_ENABLE= java JAVA_CPPFLAGS= -I"${JAVA_HOME}/include" JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"