diff options
| author | jkim <jkim@FreeBSD.org> | 2014-03-11 02:16:44 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-03-11 02:16:44 +0800 |
| commit | 9f5fbe2e446a03c999941723a7c6611b7cb1b31d (patch) | |
| tree | 0ec1a8c8b525943681852f06d13ebac6878f3828 /java/bootstrap-openjdk/Makefile | |
| parent | f52758f5c7661281ecc10b12394857fecde0ffe9 (diff) | |
| download | freebsd-ports-gnome-9f5fbe2e446a03c999941723a7c6611b7cb1b31d.tar.gz freebsd-ports-gnome-9f5fbe2e446a03c999941723a7c6611b7cb1b31d.tar.zst freebsd-ports-gnome-9f5fbe2e446a03c999941723a7c6611b7cb1b31d.zip | |
- Update to r347418.
- Re-enable mixed mode by default. Now we know it is not our problem.
- Do not build with system zlib and include libstdc++.so.6 in the distfile
to avoid misc/compat8x dependency.
Diffstat (limited to 'java/bootstrap-openjdk/Makefile')
| -rw-r--r-- | java/bootstrap-openjdk/Makefile | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile index b68cfdbebebd..31339f6b5462 100644 --- a/java/bootstrap-openjdk/Makefile +++ b/java/bootstrap-openjdk/Makefile @@ -18,8 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo ONLY_FOR_ARCH= amd64 i386 DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH} -DISTVERSION_amd64= r333271 -DISTVERSION_i386= r333271 +DISTVERSION_amd64= r347418 +DISTVERSION_i386= r347418 JDK_NAME= openjdk JDK_PORT= openjdk6 @@ -32,12 +32,15 @@ WRKSRC= ${WRKDIR}/${JDK_ROOT} INSTALLDIR= ${STAGEDIR}${PREFIX}/${JDK_ROOT} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 900010 -RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libz.so.5:${PORTSDIR}/misc/compat8x +.if !exists(/usr/lib/libstdc++.so.6) +PLIST_SUB+= LIBSTDCXX="" +.else +EXCLUDE_EXP= -not -name libstdc++.so.6 +PLIST_SUB+= LIBSTDCXX="@comment " .endif +.include <bsd.port.pre.mk> + .if ${ARCH} == "i386" PLIST_SUB+= CLIENTVM="" .else @@ -45,7 +48,7 @@ PLIST_SUB+= CLIENTVM="@comment " .endif do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} "${EXCLUDE_EXP}" @cd ${WRKSRC} && ${COPYTREE_BIN} "bin jre/bin" ${INSTALLDIR} update: |