cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r522784

Browse Source 
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@gmail.com>
PR:             243278

Approved by:	ports-secteam (blanket, unbreaks a broken build under non-default JAVA option)
This commit is contained in:
Matthias Andree 2020-01-12 12:52:49 +00:00
parent 88f033168f
commit 3e8e6c0685
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q1/; revision=522785
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
databases/db5/Makefile
View File

@ -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

9
databases/db6/Makefile
View File

@ -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}"