svn commit: r522785 - in branches/2020Q1/databases: db5 db6

[Matthias Andree]

Author: mandree
Date: Sun Jan 12 12:52:49 2020
New Revision: 522785
URL: https://svnweb.freebsd.org/changeset/ports/522785

Log:
  MFH: r522784
  
  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 <tommyhp2 at gmail.com>
  PR:             243278
  
  Approved by:	ports-secteam (blanket, unbreaks a broken build under non-default JAVA option)

Modified:
  branches/2020Q1/databases/db5/Makefile
  branches/2020Q1/databases/db6/Makefile
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/databases/db5/Makefile
==============================================================================
--- branches/2020Q1/databases/db5/Makefile	Sun Jan 12 12:47:53 2020	(r522784)
+++ branches/2020Q1/databases/db5/Makefile	Sun Jan 12 12:52:49 2020	(r522785)
@@ -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

Modified: branches/2020Q1/databases/db6/Makefile
==============================================================================
--- branches/2020Q1/databases/db6/Makefile	Sun Jan 12 12:47:53 2020	(r522784)
+++ branches/2020Q1/databases/db6/Makefile	Sun Jan 12 12:52:49 2020	(r522785)
@@ -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}"