From owner-svn-ports-all@freebsd.org Sun Jan 12 12:52:50 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6700A22EBB1; Sun, 12 Jan 2020 12:52:50 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47wc8224cJz4MXq; Sun, 12 Jan 2020 12:52:50 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 428E81BF6D; Sun, 12 Jan 2020 12:52:50 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00CCqo6S096826; Sun, 12 Jan 2020 12:52:50 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00CCqn8w096825; Sun, 12 Jan 2020 12:52:49 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202001121252.00CCqn8w096825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 12 Jan 2020 12:52:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522785 - in branches/2020Q1/databases: db5 db6 X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2020Q1/databases: db5 db6 X-SVN-Commit-Revision: 522785 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2020 12:52:50 -0000 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 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}"