mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

- Include bsd.port.pre.mk before testing if ICONV_LIB is empty. It is

Browse Source 
always empty without this. [1]
- Add -DLIBICONV_PLUG to CFLAGS to enforce the use of libc iconv even when
  libiconv is installed. [2]

PR:		ports/184204 [1], ports/184782 [1], ports/186956 [2]
Approved by:	glewis (maintainer)
This commit is contained in:
Tijl Coosemans 2014-03-05 20:59:50 +00:00
parent 0806784e42
commit 4264a8f23c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=347142
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/openjdk7/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
@ -138,6 +138,12 @@ PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel/patch
PATCH= gpatch
.endif
.include <bsd.port.pre.mk>
.if empty(ICONV_LIB)
MAKE_ENV+= EXTRA_CFLAGS=-DLIBICONV_PLUG
.endif
post-patch:
@${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp
@ -180,4 +186,4 @@ post-install:
# Register the VM
"${LOCALBASE}/bin/registervm" "${INSTALLDIR}/bin/java # OpenJDK${JDK_MAJOR_VERSION}"
.include <bsd.port.mk>
.include <bsd.port.post.mk>