diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-11-01 17:25:59 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-11-01 17:25:59 +0000 |
| commit | 627eaadea82931b33a7387fc83f03b8f277552bc (patch) | |
| tree | 33dd1544e51d17f91e493c1dd5f18c7cc0758020 /java/bootstrap-openjdk/Makefile.update | |
| parent | Update to version 0.2.2.r553 (diff) | |
- Update to r306764.
- Generate distfiles directly from pkg-plist. This list was compiled from
running "ktrace -i -tn make" on openjdk6 and openjdk7 ports.
- Re-add jre/bin/java to work around a bug in openjdk7 build infrastructure.
It is not really necessary but langtools fails to build without it because
langtools/make/tools/GenStubs/GenStubs.java executes it based on java.home
property, which points to jre subdirectory. Note this problem only exists
on recent jdk7 langtools and jdk6 and jdk8 are not affected.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=306814
Diffstat (limited to 'java/bootstrap-openjdk/Makefile.update')
| -rw-r--r-- | java/bootstrap-openjdk/Makefile.update | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/java/bootstrap-openjdk/Makefile.update b/java/bootstrap-openjdk/Makefile.update index c675e09dd142..16dd09936ff3 100644 --- a/java/bootstrap-openjdk/Makefile.update +++ b/java/bootstrap-openjdk/Makefile.update @@ -17,8 +17,6 @@ LOCALBASE?= /usr/local .include "${PORTSDIR}/Mk/bsd.commands.mk" -JDK_EXCLUDE?= demo im images java-rmi.cgi jexec jre/bin man management \ - native_threads sample src.zip JDK_PORTDIR!= ${REALPATH} ${PORTSDIR}/java/${JDK_PORT} JDK_IMAGEDIR?= ${JDK_PORTDIR}/work/build/bsd-${ARCH:S/i386/i586/}/j2sdk-image @@ -35,12 +33,13 @@ DISTDIR?= ${.CURDIR} DISTFILE= ${JDK_PORT}-${ARCH}-r${PORTREVISION}.tar.xz DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH} MAKEFILE= ${.CURDIR}/Makefile +PLIST?= ${.CURDIR}/pkg-plist +PLIST_SUB= ARCH="${ARCH}" JDK_ROOT="." -TAR_EXCLUDE= -.if !empty(JDK_EXCLUDE) -.for i in ${JDK_EXCLUDE} -TAR_EXCLUDE+= --exclude ${i} -.endfor +.if ${ARCH} == "i386" +PLIST_SUB+= CLIENTVM="" +.else +PLIST_SUB+= CLIENTVM="@comment " .endif all: @@ -64,8 +63,8 @@ all: @${SETENV} -i PATH=${PATH} ${MAKE} -C "${JDK_PORTDIR}" BATCH=yes .endif @cd "${JDK_IMAGEDIR}" && \ - ${FIND} . \! -type d | ${SORT} | \ - ${TAR} -c -f - -T - -s '|^\./|${JDK_ROOT}/|' ${TAR_EXCLUDE} | \ + ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | \ + ${GREP} -v ^@ | ${TAR} -c -f - -T - -s '|^\./|${JDK_ROOT}/|' | \ ${XZ_CMD} -9 -c > "${DISTDIR}/${DISTFILE}" @${SED} -i.bak \ 's/^DISTVERSION_${ARCH}=.*/DISTVERSION_${ARCH}= r${PORTREVISION}/' \ |