From 642be1b81d8342d3a3323f43bcf5a0bd87a5d363 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Wed, 4 Sep 2013 18:06:07 +0000 Subject: - Make ports use the libc provided iconv implementation on 10-CURRENT after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code) --- java/openjdk6/Makefile | 7 +++++++ java/openjdk7/Makefile | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'java') 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: -- cgit v1.2.3