diff options
| author | madpilot <madpilot@FreeBSD.org> | 2013-09-05 02:06:07 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2013-09-05 02:06:07 +0800 |
| commit | 41290677b018da2819144b0188ac8bd1b91a88e4 (patch) | |
| tree | f71b3671c7729b9cbc9368cea2f2fede7b20d5c8 /java | |
| parent | 02239bfdfc92a832c32cc57d07d3a1a4b3fc4ad9 (diff) | |
| download | freebsd-ports-gnome-41290677b018da2819144b0188ac8bd1b91a88e4.tar.gz freebsd-ports-gnome-41290677b018da2819144b0188ac8bd1b91a88e4.tar.zst freebsd-ports-gnome-41290677b018da2819144b0188ac8bd1b91a88e4.zip | |
- 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)
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6/Makefile | 7 | ||||
| -rw-r--r-- | java/openjdk7/Makefile | 7 |
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: |