aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2013-09-04 18:06:07 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2013-09-04 18:06:07 +0000
commit642be1b81d8342d3a3323f43bcf5a0bd87a5d363 (patch)
treef71b3671c7729b9cbc9368cea2f2fede7b20d5c8 /java
parentbcaced2c93b58d27ca266602f4049df6ba6becb3 (diff)
downloadports-642be1b81d8342d3a3323f43bcf5a0bd87a5d363.tar.gz
ports-642be1b81d8342d3a3323f43bcf5a0bd87a5d363.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/openjdk6/Makefile7
-rw-r--r--java/openjdk7/Makefile7
2 files changed, 14 insertions, 0 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index dbf42ededbb6..fca6e7df4e78 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -240,6 +240,13 @@ post-patch:
@${REINPLACE_CMD} 's|build-policy install-limited|build-policy install-unlimited|' \
${WRKSRC}/jdk/make/javax/crypto/Makefile
.endif
+.if empty(ICONV_LIB)
+ @${REINPLACE_CMD} 's| -liconv||' \
+ ${WRKSRC}/Makefile \
+ ${WRKSRC}/jdk/make/sun/splashscreen/Makefile \
+ ${WRKSRC}/jdk/make/java/npt/Makefile \
+ ${WRKSRC}/jdk/make/java/instrument/Makefile
+.endif
post-build:
.if ${PORT_OPTIONS:MTZUPDATE}
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 7b996df7d9b9..a9616ed85c80 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -159,6 +159,13 @@ post-patch:
@${REINPLACE_CMD} 's|build-policy install-limited|build-policy install-unlimited|' \
${WRKSRC}/jdk/make/javax/crypto/Makefile
.endif
+.if empty(ICONV_LIB)
+ @${REINPLACE_CMD} 's| -liconv||' \
+ ${WRKSRC}/Makefile \
+ ${WRKSRC}/jdk/make/sun/splashscreen/Makefile \
+ ${WRKSRC}/jdk/make/java/npt/Makefile \
+ ${WRKSRC}/jdk/make/java/instrument/Makefile
+.endif
.if ${PORT_OPTIONS:MTZUPDATE}
pre-install: