diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2019-03-28 23:27:12 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2019-03-28 23:27:12 +0000 |
| commit | d3c95d36f146bad25d18a10d91ba5c2e416770e7 (patch) | |
| tree | 357c5af726c90504372953be9e5f385844a52f78 /java/openjdk12 | |
| parent | d98a910efa50ef4513b16989b8cd04a8f1934135 (diff) | |
| download | ports-d3c95d36f146bad25d18a10d91ba5c2e416770e7.tar.gz ports-d3c95d36f146bad25d18a10d91ba5c2e416770e7.zip | |
Fix iconv(3) issues.
PR: 236759
Notes
Notes:
svn path=/head/; revision=497061
Diffstat (limited to 'java/openjdk12')
| -rw-r--r-- | java/openjdk12/Makefile | 13 | ||||
| -rw-r--r-- | java/openjdk12/files/patch-make_autoconf_libraries.m4 | 19 |
2 files changed, 28 insertions, 4 deletions
diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index e346d301f187..f715f1c32a04 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://github.com/battleblow/openjdk-jdk12u/archive/ PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -115,10 +115,11 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 JDK_BUILD_JVM= server .if empty(ICONV_LIB) -ICONV_CPPFLAGS= -DLIBICONV_PLUG +ICONV_CFLAGS= -DLIBICONV_PLUG .else -ICONV_CPPFLAGS= -I${LOCALBASE}/include -ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} +ICONV_CFLAGS= -I${LOCALBASE}/include +ICONV_LDFLAGS= -L${LOCALBASE}/lib +ICONV_LIBS= ${ICONV_LIB} .endif post-patch: @@ -126,6 +127,10 @@ post-patch: @${CHMOD} 755 ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ + -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ + -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ + ${WRKSRC}/make/autoconf/libraries.m4 do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} diff --git a/java/openjdk12/files/patch-make_autoconf_libraries.m4 b/java/openjdk12/files/patch-make_autoconf_libraries.m4 new file mode 100644 index 000000000000..4c3f45ca80d0 --- /dev/null +++ b/java/openjdk12/files/patch-make_autoconf_libraries.m4 @@ -0,0 +1,19 @@ +--- make/autoconf/libraries.m4 ++++ make/autoconf/libraries.m4 +@@ -181,9 +181,13 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], + LIBS="$save_LIBS" + + if test "x$OPENJDK_TARGET_OS" = "xbsd"; then +- if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then +- ICONV_CFLAGS="-I$PACKAGE_PATH/include" +- ICONV_LDFLAGS="-L$PACKAGE_PATH/lib" ++ if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then ++ ICONV_CFLAGS=%%ICONV_CFLAGS%% ++ ICONV_LDFLAGS=%%ICONV_LDFLAGS%% ++ ICONV_LIBS=%%ICONV_LIBS%% ++ elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then ++ ICONV_CFLAGS="-I/usr/local/include" ++ ICONV_LDFLAGS="-L/usr/local/lib" + ICONV_LIBS=-liconv + else + ICONV_CFLAGS= |