diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2014-07-12 17:36:17 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2014-07-12 17:36:17 +0000 |
| commit | 49d7c249aa660ff9d9226cde703502f29b639bf1 (patch) | |
| tree | 8b7d948c29d6ee475f448c713f2a0e54bf9bf861 /java/openjdk7 | |
| parent | 0bd9a545660037e43654459539fddf7e9287bfed (diff) | |
| download | ports-49d7c249aa660ff9d9226cde703502f29b639bf1.tar.gz ports-49d7c249aa660ff9d9226cde703502f29b639bf1.zip | |
. Fix unpack200 on i386/amd64 by only swapping bytes when this is actually
a big endian machine. [1]
. Bump PORTREVISION for the fix.
. Speed up the build on multi-core machines using the MAKE_JOBS trickery
from the openjdk8 Makefile.
. Enlist openjdk7 users as testers of ant 1.9.4.
. Add a dependency on fontconfig.
PR: 191735 [1]
Requested by: Michael Schmiedgen <schmiedgen@takwa.de> [2]
Notes
Notes:
svn path=/head/; revision=361627
Diffstat (limited to 'java/openjdk7')
| -rw-r--r-- | java/openjdk7/Makefile | 11 | ||||
| -rw-r--r-- | java/openjdk7/distinfo | 4 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-src-share-native-com-sun-java-util-jar-pack-zip.cpp | 22 |
3 files changed, 30 insertions, 7 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index a7cfb239a21e..47685dbeedf7 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -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}/ \ @@ -29,7 +29,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USES= dos2unix iconv gmake zip USE_XORG+= x11 xext xi xrender xt xtst MAKE_ARGS= CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q} -MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DEBUG POLICY TZUPDATE OPTIONS_DEFAULT= POLICY TZUPDATE @@ -46,13 +45,14 @@ JDK_BUILD_DATE= 26_aug_2013 JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE} # Use our own version of ant to avoid circular dependencies -ANT_VERSION= 1.9.3 +ANT_VERSION= 1.9.4 ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin LATEST_LINK= openjdk7 -LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libasound.so:${PORTSDIR}/audio/alsa-lib +LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ + libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \ ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client @@ -68,6 +68,7 @@ NOPRECIOUSMAKEVARS= yes ONLY_FOR_ARCHS= i386 amd64 +_MAKE_JOBS= # MAKE_ENV+= LANG="C" \ LC_ALL="C" \ JAVA_HOME="" \ diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo index 64137e4f2a95..fe6e401981ee 100644 --- a/java/openjdk7/distinfo +++ b/java/openjdk7/distinfo @@ -1,4 +1,4 @@ SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596 SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196 -SHA256 (apache-ant-1.9.3-bin.zip) = 32caa50e473a81c3f6a0f68eb6a103b2eeb95bff09e62f78e93571b20f8237e1 -SIZE (apache-ant-1.9.3-bin.zip) = 8264969 +SHA256 (apache-ant-1.9.4-bin.zip) = 973d97d656e65561e2753823de6cf6db35570aaf93eeec6e7cb3d68e1ec4d0e8 +SIZE (apache-ant-1.9.4-bin.zip) = 8309406 diff --git a/java/openjdk7/files/patch-src-share-native-com-sun-java-util-jar-pack-zip.cpp b/java/openjdk7/files/patch-src-share-native-com-sun-java-util-jar-pack-zip.cpp new file mode 100644 index 000000000000..d8979578894b --- /dev/null +++ b/java/openjdk7/files/patch-src-share-native-com-sun-java-util-jar-pack-zip.cpp @@ -0,0 +1,22 @@ +--- jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp.orig 2014-07-12 09:24:56.000000000 -0700 ++++ jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2014-07-12 09:28:38.000000000 -0700 +@@ -33,6 +33,10 @@ + + #include <stdlib.h> + ++#ifdef _ALLBSD_SOURCE ++#include <machine/endian.h> ++#endif ++ + #ifndef _MSC_VER + #include <strings.h> + #endif +@@ -62,7 +66,7 @@ + + #endif // End of ZLIB + +-#ifdef _BIG_ENDIAN ++#if (BYTE_ORDER == BIG_ENDIAN) + #define SWAP_BYTES(a) \ + ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00) + #else |