diff options
Diffstat (limited to 'java/openjdk12/Makefile')
| -rw-r--r-- | java/openjdk12/Makefile | 13 |
1 files changed, 9 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} |