Index: head/java/openjdk6/Makefile =================================================================== --- head/java/openjdk6/Makefile (revision 374823) +++ head/java/openjdk6/Makefile (revision 374824) @@ -1,355 +1,358 @@ # Created by: Brian Gardner # $FreeBSD$ PORTNAME= openjdk6 PORTVERSION= b33 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \ http://download.java.net/openjdk/jtreg/promoted/4.1/b05/:jtreg \ https://java.net/downloads/openjdk6/ \ LOCAL MASTER_SITE_SUBDIR= jkim DISTNAME= openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE} DISTFILES= ${ANTFILE}:ant \ ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} ${ANTFILE} MAINTAINER= java@FreeBSD.org COMMENT?= Oracle's Java 6 virtual machine release under the GPL v2 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu OPENJDK_BUILDDATE= 14_oct_2014 OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE ICEDTEA_DESC= Apply additional patches from IcedTea POLICY_DESC= Install the Unlimited Strength Policy Files SOUND_DESC= Enable sound support TZUPDATE_DESC= Update the time zone data .if !defined(BUILD_JRE) OPTIONS_DEFINE+=TEST OPTIONS_RADIO= DEVEL DEVEL_DESC= Build for OpenJDK development OPTIONS_RADIO_DEVEL= DEBUG FASTDEBUG DEBUG_DESC= Enable legacy debugging support FASTDEBUG_DESC= Include fastdebug build TEST_DESC= Add support for running regression test .endif PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install USES= compiler gmake iconv motif tar:xz .include .include "${.CURDIR}/../openjdk6/Makefile.icedtea" .include "${.CURDIR}/../openjdk6/Makefile.test" EXTRA_PATCHES+= ${ICEDTEA_PATCHES} # java extracts directly to the cwd WRKSRC= ${WRKDIR} USE_XORG= x11 xext xi xt xtst # do not depend on devel/apache-ant to avoid circular dependency, but # use .tar.bz2 distfile to avoid duplicated downloads ANTVERSION= 1.9.4 ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2 JTREG_BUILD= b05_29_nov_2012 JTREGFILE= jtreg-4.1-bin-${JTREG_BUILD}.zip UPDATE_VERSION= 32 .if ${PORT_OPTIONS:MIPV6} CATEGORIES+= ipv6 .endif .if ${PORT_OPTIONS:MTZUPDATE} RUN_DEPENDS+= ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo .endif # avoid ARCH in MAKEFLAGS, breaks build NOPRECIOUSMAKEVARS= yes ONLY_FOR_ARCHS= amd64 i386 BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk6 \ ${LOCALBASE}/bootstrap-openjdk # do we have valid native jdk installed? .for CJDK in ${BOOTSTRAP_JDKS} . if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac) BOOTSTRAPJDKDIR= ${CJDK} . endif .endfor # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/bootstrap-openjdk .endif MAKE_ENV= LANG=C LC_ALL=C OS= \ ALT_JDK_IMPORT_PATH=${BOOTSTRAPJDKDIR} \ ALT_BOOTDIR=${BOOTSTRAPJDKDIR} \ ALT_CACERTS_FILE=${FILESDIR}/cacerts \ ALT_CUPS_HEADERS_PATH=${LOCALBASE}/include \ ALT_CUPS_LIB_PATH=${LOCALBASE}/lib \ ALT_FREETYPE_HEADERS_PATH=${LOCALBASE}/include \ ALT_FREETYPE_LIB_PATH=${LOCALBASE}/lib \ ALT_X11_PATH=${LOCALBASE} \ ALT_PACKAGE_PATH=${LOCALBASE} \ ANT_HOME=${WRKDIR}/apache-ant-${ANTVERSION} \ JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \ BUILD_NUMBER=${PORTVERSION} \ NO_DOCS=true \ MILESTONE=fcs \ JDK_UPDATE_VERSION=${UPDATE_VERSION} # XXX Turn off parallel build by default. MAKE_JOBS_UNSAFE= yes MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER} .if ${PORT_OPTIONS:MDEBUG} ALL_TARGET= debug_build OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/}-debug .else OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/} .endif # disable FASTDEBUG_BUILD by default to improve compile time. .if ${PORT_OPTIONS:MFASTDEBUG} MAKE_ENV+= SKIP_FASTDEBUG_BUILD=false .else MAKE_ENV+= SKIP_FASTDEBUG_BUILD=true .endif .if empty(PORT_OPTIONS:MIPV6) MAKE_ENV+= DONT_ENABLE_IPV6="YES" .endif .if ${PORT_OPTIONS:MSOUND} EXTRA_PATCHES+= ${FILESDIR}/alsa-enable.patch LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins .else EXTRA_PATCHES+= ${FILESDIR}/alsa-disable.patch .endif .if ${PORT_OPTIONS:MTEST} DISTFILES+= ${JTREGFILE}:jtreg EXTRACT_ONLY+= ${JTREGFILE} BUILD_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu USES+= display:test .else EXTRA_PATCHES+= ${FILESDIR}/test_gamma-disable.patch .endif COPYDIRS= \ jdk/src/linux/doc/man COPYFILES= \ corba/make/common/Defs-linux.gmk \ corba/make/common/shared/Defs-linux.gmk \ hotspot/src/os/linux/vm/decoder_linux.cpp \ jdk/make/com/sun/tools/attach/mapfile-linux \ jdk/make/common/Defs-linux.gmk \ jdk/make/common/shared/Defs-linux.gmk \ jdk/make/java/nio/mapfile-linux \ jdk/make/netbeans/common/architectures/name-Linux.properties \ jdk/make/sun/awt/mapfile-vers-linux \ jdk/make/tools/sharing/classlist.linux \ jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux \ jdk/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \ jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java \ jdk/src/solaris/hpi/include/largefile_linux.h \ jdk/src/solaris/native/java/net/linux_close.c \ jdk/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c .include .if empty(ICONV_LIB) ICONV_CPPFLAGS= -DLIBICONV_PLUG .else ICONV_CPPFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} .endif ZLIB_LDFLAGS?= -lz .if ${COMPILER_TYPE} == "clang" +.if ${COMPILER_VERSION} >= 35 +MAKE_ENV+= COMPILER_WARNINGS_FATAL=false +.endif MAKE_ENV+= USE_CLANG=true .endif post-extract: @for d in ${COPYDIRS}; do \ ${MKDIR} `echo ${WRKSRC}/$$d | ${SED} 's/linux/bsd/g;'`; \ cd ${WRKSRC}/$$d; \ for f in *; do \ if [ -f $$f ]; then \ t=`echo ${WRKSRC}/$$d/$$f | ${SED} 's/linux/bsd/g; s/Linux/Bsd/g'`; \ ${SED} 's/linux/bsd/g; s/Linux/Bsd/g; s/LINUX/BSD/g' < $$f > $$t; \ fi; \ done; \ done @for f in ${COPYFILES}; do \ t=`echo $$f | ${SED} 's/linux/bsd/g; s/Linux/Bsd/g'`; \ ${SED} 's/linux/bsd/g; s/Linux/Bsd/g' < ${WRKSRC}/$$f > ${WRKSRC}/$$t; \ done @${SED} 's/solaris/bsd/g; s/Solaris/Bsd/g' \ ${WRKSRC}/jdk/src/solaris/hpi/native_threads/src/threads_solaris.c > \ ${WRKSRC}/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c @${SED} "s|/usr/local|${LOCALBASE}|" \ ${FILESDIR}/fontconfig.properties > \ ${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties @${SED} "s|%%LOCALBASE%%|${LOCALBASE}|" ${FILESDIR}/Makefile.test.in > \ ${WRKSRC}/jdk/test/Makefile @${FIND} ${WRKSRC}/jdk/test -type f -name \*.sh -exec ${SED} -i "" \ -e s/Linux/FreeBSD/g {} \; post-patch: @${REINPLACE_CMD} -e "s|%%CXX_LDFLAGS%%|${CXX_LDFLAGS}|" \ ${WRKSRC}/corba/make/common/Defs-bsd.gmk \ ${WRKSRC}/jdk/make/common/Defs-bsd.gmk .if ${COMPILER_TYPE} == "clang" @${REINPLACE_CMD} -e "s|-fno-omit-frame-pointer|-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer|" \ ${WRKSRC}/corba/make/common/Defs-bsd.gmk \ ${WRKSRC}/hotspot/make/bsd/makefiles/amd64.make \ ${WRKSRC}/jdk/make/common/Defs-bsd.gmk .endif @${REINPLACE_CMD} -e "s|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|" \ -e "s|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|" \ ${WRKSRC}/Makefile ${WRKSRC}/jdk/make/java/instrument/Makefile \ ${WRKSRC}/jdk/make/java/npt/Makefile \ ${WRKSRC}/jdk/make/sun/splashscreen/Makefile @${REINPLACE_CMD} -e "s|%%ZLIB_LDFLAGS%%|${ZLIB_LDFLAGS}|" \ ${WRKSRC}/jdk/make/com/sun/java/pack/Makefile \ ${WRKSRC}/jdk/make/common/Program.gmk \ ${WRKSRC}/jdk/make/java/jli/Makefile \ ${WRKSRC}/jdk/make/java/zip/Makefile \ ${WRKSRC}/jdk/make/tools/freetypecheck/Makefile @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" \ ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp \ ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \ ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java .if ${PORT_OPTIONS:MPOLICY} @${REINPLACE_CMD} -e 's|%%POLICY%%|unlimited|' \ ${WRKSRC}/jdk/make/javax/crypto/Makefile .else @${REINPLACE_CMD} -e 's|%%POLICY%%|limited|' \ ${WRKSRC}/jdk/make/javax/crypto/Makefile .endif .if defined(BUILD_JRE) @${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${PREFIX}/openjdk6-jre|" \ ${WRKSRC}/hotspot/src/os/posix/launcher/java_md.c \ ${WRKSRC}/jdk/src/solaris/bin/java_md.c .else @${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${PREFIX}/openjdk6|" \ ${WRKSRC}/hotspot/src/os/posix/launcher/java_md.c \ ${WRKSRC}/jdk/src/solaris/bin/java_md.c .endif post-build: .if ${PORT_OPTIONS:MTZUPDATE} @# Update time zones .if defined(BUILD_JRE) @${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi @${LN} -s -f ${LOCALBASE}/share/java/zi \ ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib .else @${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi @${LN} -s -f ${LOCALBASE}/share/java/zi \ ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib .endif .endif .if ${PORT_OPTIONS:MTEST} @${ECHO_MSG} "" @${ECHO_MSG} "Run \"make test\" to execute regression test (it could take a few hours to complete)." .if defined(DISPLAY) @${ECHO_MSG} "Unset the environment DISPLAY variable to run tests in a virtual X server." .endif @${ECHO_MSG} "" .endif do-install: .if defined(BUILD_JRE) @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6-jre \ "-not ( -type d -name bin -prune )" @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \ ${COPYTREE_BIN} bin ${STAGEDIR}${PREFIX}/openjdk6-jre @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \ ${INSTALL_PROGRAM} lib/${ARCH}/jexec \ ${STAGEDIR}${PREFIX}/openjdk6-jre/lib/${ARCH} .else @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6 \ "-not ( -type d -name bin -prune )" @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \ ${COPYTREE_BIN} "bin jre/bin" ${STAGEDIR}${PREFIX}/openjdk6 @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \ ${INSTALL_PROGRAM} jre/lib/${ARCH}/jexec \ ${STAGEDIR}${PREFIX}/openjdk6/jre/lib/${ARCH} @cd ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars && \ ${INSTALL_DATA} compilefontconfig.jar javazic.jar \ ${STAGEDIR}${PREFIX}/openjdk6/jre/lib .if ${PORT_OPTIONS:MFASTDEBUG} @cd ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/openjdk6-fastdebug \ "-not ( -type d -name bin -prune )" @cd ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image && \ ${COPYTREE_BIN} "bin jre/bin" \ ${STAGEDIR}${PREFIX}/openjdk6-fastdebug @cd ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image && \ ${INSTALL_PROGRAM} jre/lib/${ARCH}/jexec \ ${STAGEDIR}${PREFIX}/openjdk6-fastdebug/jre/lib/${ARCH} .endif .endif @${ECHO_CMD} "#!/bin/sh" > ${PKGDEINSTALL} @${ECHO_CMD} "#!/bin/sh" > ${PKGINSTALL} .if defined(BUILD_JRE) @cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \ ${FIND} -s . -not -type d | \ ${SED} -e 's,^\./,openjdk6-jre/,' >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \ ${FIND} -s . -type d -empty | \ ${SED} 's,^\./,@dir openjdk6-jre/,' >> ${TMPPLIST} @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL} @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL} .else @cd ${STAGEDIR}${PREFIX}/openjdk6 && \ ${FIND} -s . -not -type d | \ ${SED} -e 's,^\./,openjdk6/,' >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX}/openjdk6 && \ ${FIND} -s . -type d -empty | \ ${SED} 's,^\./,@dir openjdk6/,' >> ${TMPPLIST} @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL} @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL} .if ${PORT_OPTIONS:MFASTDEBUG} @cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \ ${FIND} -s . -not -type d | \ ${SED} -e 's,^\./,openjdk6-fastdebug/,' >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \ ${FIND} -s . -type d -empty | \ ${SED} 's,^\./,@dir openjdk6-fastdebug/,' >> ${TMPPLIST} @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL} @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL} .endif .endif @${ECHO_CMD} "exit 0" >> ${PKGDEINSTALL} @${ECHO_CMD} "exit 0" >> ${PKGINSTALL} .include Index: head/java/openjdk6/files/patch-remove-FileBuffRegion =================================================================== --- head/java/openjdk6/files/patch-remove-FileBuffRegion (revision 374823) +++ head/java/openjdk6/files/patch-remove-FileBuffRegion (nonexistent) @@ -1,270 +0,0 @@ - -# HG changeset patch -# User lfoltan -# Date 1399384615 14400 -# Node ID 21130eb5768d79c7f3a4ef0b9d976d1942de09ad -# Parent e7a6a3354c8409f739c52ffeb224bb59c1351b64 -8041620: Solaris Studio 12.4 C++ 5.13 change in behavior for placing friend declarations within surrounding scope. -Summary: Remove adlc's unused class FileBuffRegion. -Reviewed-by: coleenp, dholmes, kvn - -diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.cpp ---- hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 08:59:57 2014 -0400 -+++ hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 09:56:55 2014 -0400 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -89,200 +89,6 @@ - return retval; - } - --//------------------------------FileBuffRegion--------------------------------- --// Create a new region in a FileBuff. --FileBuffRegion::FileBuffRegion( FileBuff* bufr, int soln, int ln, -- int off, int len) --: _bfr(bufr), _sol(soln), _line(ln), _offset(off), _length(len) { -- _next = NULL; // No chained regions --} -- --//------------------------------~FileBuffRegion-------------------------------- --// Delete the entire linked list of buffer regions. --FileBuffRegion::~FileBuffRegion() { -- if( _next ) delete _next; --} -- --//------------------------------copy------------------------------------------- --// Deep copy a FileBuffRegion --FileBuffRegion *FileBuffRegion::copy() { -- if( !this ) return NULL; // The empty buffer region -- FileBuffRegion *br = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); -- if( _next ) br->_next = _next->copy(); -- return br; --} -- --//------------------------------merge------------------------------------------ --// Merge another buffer region into this buffer region. Make overlapping areas --// become a single region. Remove (delete) the input FileBuffRegion. --// Since the buffer regions are sorted by file offset, this is a varient of a --// "sorted-merge" running in linear time. --FileBuffRegion *FileBuffRegion::merge( FileBuffRegion *br ) { -- if( !br ) return this; // Merging nothing -- if( !this ) return br; // Merging into nothing -- -- assert( _bfr == br->_bfr, "" ); // Check for pointer-equivalent buffers -- -- if( _offset < br->_offset ) { // "this" starts before "br" -- if( _offset+_length < br->_offset ) { // "this" ends before "br" -- if( _next ) _next->merge( br ); // Merge with remainder of list -- else _next = br; // No more in this list; just append. -- } else { // Regions overlap. -- int l = br->_offset + br->_length - _offset; -- if( l > _length ) _length = l; // Pick larger region -- FileBuffRegion *nr = br->_next; // Get rest of region -- br->_next = NULL; // Remove indication of rest of region -- delete br; // Delete this region (it's been subsumed). -- if( nr ) merge( nr ); // Merge with rest of region -- } // End of if regions overlap or not. -- } else { // "this" starts after "br" -- if( br->_offset+br->_length < _offset ) { // "br" ends before "this" -- FileBuffRegion *nr = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); -- nr->_next = _next; // Structure copy "this" guy to "nr" -- *this = *br; // Structure copy "br" over "this". -- br->_next = NULL; // Remove indication of rest of region -- delete br; // Delete this region (it's been copied) -- merge( nr ); // Finish merging -- } else { // Regions overlap. -- int l = _offset + _length - br->_offset; -- if( l > _length ) _length = l; // Pick larger region -- _offset = br->_offset; // Start with earlier region -- _sol = br->_sol; // Also use earlier line start -- _line = br->_line; // Also use earlier line -- FileBuffRegion *nr = br->_next; // Get rest of region -- br->_next = NULL; // Remove indication of rest of region -- delete br; // Delete this region (it's been subsumed). -- if( nr ) merge( nr ); // Merge with rest of region -- } // End of if regions overlap or not. -- } -- return this; --} -- --//------------------------------expandtab-------------------------------------- --static int expandtab( ostream &os, int off, char c, char fill1, char fill2 ) { -- if( c == '\t' ) { // Tab? -- do os << fill1; // Expand the tab; Output space -- while( (++off) & 7 ); // Expand to tab stop -- } else { // Normal character -- os << fill2; // Display normal character -- off++; // Increment "cursor" offset -- } -- return off; --} -- --//------------------------------printline-------------------------------------- --// Print and highlite a region of a line. Return the amount of highliting left --// to do (i.e. highlite length minus length of line). --static int printline( ostream& os, const char *fname, int line, -- const char *_sol, int skip, int len ) { -- -- // Display the entire tab-expanded line -- os << fname << ":" << line << ": "; -- const char *t = strchr(_sol,'\n')+1; // End of line -- int off = 0; // Cursor offset for tab expansion -- const char *s = _sol; // Nice string pointer -- while( t-s ) { // Display whole line -- char c = *s++; // Get next character to display -- off = expandtab(os,off,c,' ',c); -- } -- -- // Display the tab-expanded skippings before underlining. -- os << fname << ":" << line << ": "; -- off = 0; // Cursor offset for tab expansion -- s = _sol; // Restart string pointer -- -- // Start underlining. -- if( skip != -1 ) { // The no-start-indicating flag -- const char *u = _sol+skip; // Amount to skip -- while( u-s ) // Display skipped part -- off = expandtab(os,off,*s++,' ',' '); -- os << '^'; // Start region -- off++; // Moved cursor -- len--; // 1 less char to do -- if( *s++ == '\t' ) // Starting character is a tab? -- off = expandtab(os,off,'\t','-','^'); -- } -- -- // Long region doesn't end on this line -- int llen = (int)(t-s); // Length of line, minus what's already done -- if( len > llen ) { // Doing entire rest of line? -- while( t-s ) // Display rest of line -- off = expandtab(os,off,*s++,'-','-'); -- os << '\n'; // EOL -- return len-llen; // Return what's not yet done. -- } -- -- // Region does end on this line. This code fails subtly if the region ends -- // in a tab character. -- int i; -- for( i=1; iprint(os); // Print region -- brp = brp->_next; // Chain to next -- } -- return os; // Return final stream --} -- --//------------------------------print------------------------------------------ --// Print the FileBuffRegion to a stream. FileBuffRegions are printed with the --// filename and line number to the left, and complete text lines to the right. --// Selected portions (portions of a line actually in the FileBuffRegion are --// underlined. Ellipses are used for long multi-line regions. --//void FileBuffRegion::print( std::ostream& os ) { --void FileBuffRegion::print( ostream& os ) { -- if( !this ) return; // Nothing to print -- char *s = _bfr->get_line(); -- int skip = (int)(_offset - _sol); // Amount to skip to start of data -- int len = printline( os, _bfr->_fp->_name, _line, s, skip, _length ); -- -- if( !len ) return; // All done; exit -- -- // Here we require at least 2 lines -- int off1 = _length - len + skip; // Length of line 1 -- int off2 = off1 + _sol; // Offset to start of line 2 -- char *s2 = _bfr->get_line(); // Start of line 2 -- char *s3 = strchr( s2, '\n' )+1; // Start of line 3 (unread) -- if( len <= (s3-s2) ) { // It all fits on the next line -- printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Print&underline -- return; -- } -- -- // Here we require at least 3 lines -- int off3 = off2 + (int)(s3-s2); // Offset to start of line 3 -- s3 = _bfr->get_line(); // Start of line 3 (read) -- const char *s4 = strchr( s3, '\n' )+1;// Start of line 4 (unread) -- if( len < (s4-s3) ) { // It all fits on the next 2 lines -- s2 = _bfr->get_line(); -- len = printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Line 2 -- s3 = _bfr->get_line(); -- printline( os, _bfr->_fp->_name, _line+2, s3, -1, len ); // Line 3 -- return; -- } -- -- // Here we require at least 4 lines. -- // Print only the 1st and last line, with ellipses in middle. -- os << "...\n"; // The ellipses -- int cline = _line+1; // Skipped 2 lines -- do { // Do until find last line -- len -= (int)(s3-s2); // Remove length of line -- cline++; // Next line -- s2 = _bfr->get_line(); // Get next line from end of this line -- s3 = strchr( s2, '\n' ) + 1;// Get end of next line -- } while( len > (s3-s2) ); // Repeat until last line -- printline( os, _bfr->_fp->_name, cline, s2, -1, len ); // Print & underline --} -- - //------------------------------file_error------------------------------------- - void FileBuff::file_error(int flag, int linenum, const char *fmt, ...) - { -diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.hpp ---- hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 08:59:57 2014 -0400 -+++ hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 09:56:55 2014 -0400 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -46,7 +46,6 @@ - // This class defines a nicely behaved buffer of text. Entire file of text - // is read into buffer at creation, with sentinels at start and end. - class FileBuff { -- friend class FileBuffRegion; - private: - long _bufferSize; // Size of text holding buffer. - long _offset; // Expected filepointer offset. -@@ -82,29 +81,4 @@ - // when the pointer is valid (i.e. just obtained from getline()). - long getoff(const char* s) { return _bufoff + (long)(s - _buf); } - }; -- --//------------------------------FileBuffRegion--------------------------------- --// A buffer region is really a region of some file, specified as a linked list --// of offsets and lengths. These regions can be merged; overlapping regions --// will coalesce. --class FileBuffRegion { -- public: // Workaround dev-studio friend/private bug -- FileBuffRegion *_next; // Linked list of regions sorted by offset. -- private: -- FileBuff *_bfr; // The Buffer of the file -- int _offset, _length; // The file area -- int _sol; // Start of line where the file area starts -- int _line; // First line of region -- -- public: -- FileBuffRegion(FileBuff*, int sol, int line, int offset, int len); -- ~FileBuffRegion(); -- -- FileBuffRegion *copy(); // Deep copy -- FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input -- -- void print(ostream&); -- friend ostream& operator<< (ostream&, FileBuffRegion&); --}; -- - #endif // SHARE_VM_ADLC_FILEBUFF_HPP - Property changes on: head/java/openjdk6/files/patch-remove-FileBuffRegion ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/openjdk7/files/patch-remove-FileBuffRegion =================================================================== --- head/java/openjdk7/files/patch-remove-FileBuffRegion (revision 374823) +++ head/java/openjdk7/files/patch-remove-FileBuffRegion (nonexistent) @@ -1,270 +0,0 @@ - -# HG changeset patch -# User lfoltan -# Date 1399384615 14400 -# Node ID 21130eb5768d79c7f3a4ef0b9d976d1942de09ad -# Parent e7a6a3354c8409f739c52ffeb224bb59c1351b64 -8041620: Solaris Studio 12.4 C++ 5.13 change in behavior for placing friend declarations within surrounding scope. -Summary: Remove adlc's unused class FileBuffRegion. -Reviewed-by: coleenp, dholmes, kvn - -diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.cpp ---- hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 08:59:57 2014 -0400 -+++ hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 09:56:55 2014 -0400 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -89,200 +89,6 @@ - return retval; - } - --//------------------------------FileBuffRegion--------------------------------- --// Create a new region in a FileBuff. --FileBuffRegion::FileBuffRegion( FileBuff* bufr, int soln, int ln, -- int off, int len) --: _bfr(bufr), _sol(soln), _line(ln), _offset(off), _length(len) { -- _next = NULL; // No chained regions --} -- --//------------------------------~FileBuffRegion-------------------------------- --// Delete the entire linked list of buffer regions. --FileBuffRegion::~FileBuffRegion() { -- if( _next ) delete _next; --} -- --//------------------------------copy------------------------------------------- --// Deep copy a FileBuffRegion --FileBuffRegion *FileBuffRegion::copy() { -- if( !this ) return NULL; // The empty buffer region -- FileBuffRegion *br = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); -- if( _next ) br->_next = _next->copy(); -- return br; --} -- --//------------------------------merge------------------------------------------ --// Merge another buffer region into this buffer region. Make overlapping areas --// become a single region. Remove (delete) the input FileBuffRegion. --// Since the buffer regions are sorted by file offset, this is a varient of a --// "sorted-merge" running in linear time. --FileBuffRegion *FileBuffRegion::merge( FileBuffRegion *br ) { -- if( !br ) return this; // Merging nothing -- if( !this ) return br; // Merging into nothing -- -- assert( _bfr == br->_bfr, "" ); // Check for pointer-equivalent buffers -- -- if( _offset < br->_offset ) { // "this" starts before "br" -- if( _offset+_length < br->_offset ) { // "this" ends before "br" -- if( _next ) _next->merge( br ); // Merge with remainder of list -- else _next = br; // No more in this list; just append. -- } else { // Regions overlap. -- int l = br->_offset + br->_length - _offset; -- if( l > _length ) _length = l; // Pick larger region -- FileBuffRegion *nr = br->_next; // Get rest of region -- br->_next = NULL; // Remove indication of rest of region -- delete br; // Delete this region (it's been subsumed). -- if( nr ) merge( nr ); // Merge with rest of region -- } // End of if regions overlap or not. -- } else { // "this" starts after "br" -- if( br->_offset+br->_length < _offset ) { // "br" ends before "this" -- FileBuffRegion *nr = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); -- nr->_next = _next; // Structure copy "this" guy to "nr" -- *this = *br; // Structure copy "br" over "this". -- br->_next = NULL; // Remove indication of rest of region -- delete br; // Delete this region (it's been copied) -- merge( nr ); // Finish merging -- } else { // Regions overlap. -- int l = _offset + _length - br->_offset; -- if( l > _length ) _length = l; // Pick larger region -- _offset = br->_offset; // Start with earlier region -- _sol = br->_sol; // Also use earlier line start -- _line = br->_line; // Also use earlier line -- FileBuffRegion *nr = br->_next; // Get rest of region -- br->_next = NULL; // Remove indication of rest of region -- delete br; // Delete this region (it's been subsumed). -- if( nr ) merge( nr ); // Merge with rest of region -- } // End of if regions overlap or not. -- } -- return this; --} -- --//------------------------------expandtab-------------------------------------- --static int expandtab( ostream &os, int off, char c, char fill1, char fill2 ) { -- if( c == '\t' ) { // Tab? -- do os << fill1; // Expand the tab; Output space -- while( (++off) & 7 ); // Expand to tab stop -- } else { // Normal character -- os << fill2; // Display normal character -- off++; // Increment "cursor" offset -- } -- return off; --} -- --//------------------------------printline-------------------------------------- --// Print and highlite a region of a line. Return the amount of highliting left --// to do (i.e. highlite length minus length of line). --static int printline( ostream& os, const char *fname, int line, -- const char *_sol, int skip, int len ) { -- -- // Display the entire tab-expanded line -- os << fname << ":" << line << ": "; -- const char *t = strchr(_sol,'\n')+1; // End of line -- int off = 0; // Cursor offset for tab expansion -- const char *s = _sol; // Nice string pointer -- while( t-s ) { // Display whole line -- char c = *s++; // Get next character to display -- off = expandtab(os,off,c,' ',c); -- } -- -- // Display the tab-expanded skippings before underlining. -- os << fname << ":" << line << ": "; -- off = 0; // Cursor offset for tab expansion -- s = _sol; // Restart string pointer -- -- // Start underlining. -- if( skip != -1 ) { // The no-start-indicating flag -- const char *u = _sol+skip; // Amount to skip -- while( u-s ) // Display skipped part -- off = expandtab(os,off,*s++,' ',' '); -- os << '^'; // Start region -- off++; // Moved cursor -- len--; // 1 less char to do -- if( *s++ == '\t' ) // Starting character is a tab? -- off = expandtab(os,off,'\t','-','^'); -- } -- -- // Long region doesn't end on this line -- int llen = (int)(t-s); // Length of line, minus what's already done -- if( len > llen ) { // Doing entire rest of line? -- while( t-s ) // Display rest of line -- off = expandtab(os,off,*s++,'-','-'); -- os << '\n'; // EOL -- return len-llen; // Return what's not yet done. -- } -- -- // Region does end on this line. This code fails subtly if the region ends -- // in a tab character. -- int i; -- for( i=1; iprint(os); // Print region -- brp = brp->_next; // Chain to next -- } -- return os; // Return final stream --} -- --//------------------------------print------------------------------------------ --// Print the FileBuffRegion to a stream. FileBuffRegions are printed with the --// filename and line number to the left, and complete text lines to the right. --// Selected portions (portions of a line actually in the FileBuffRegion are --// underlined. Ellipses are used for long multi-line regions. --//void FileBuffRegion::print( std::ostream& os ) { --void FileBuffRegion::print( ostream& os ) { -- if( !this ) return; // Nothing to print -- char *s = _bfr->get_line(); -- int skip = (int)(_offset - _sol); // Amount to skip to start of data -- int len = printline( os, _bfr->_fp->_name, _line, s, skip, _length ); -- -- if( !len ) return; // All done; exit -- -- // Here we require at least 2 lines -- int off1 = _length - len + skip; // Length of line 1 -- int off2 = off1 + _sol; // Offset to start of line 2 -- char *s2 = _bfr->get_line(); // Start of line 2 -- char *s3 = strchr( s2, '\n' )+1; // Start of line 3 (unread) -- if( len <= (s3-s2) ) { // It all fits on the next line -- printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Print&underline -- return; -- } -- -- // Here we require at least 3 lines -- int off3 = off2 + (int)(s3-s2); // Offset to start of line 3 -- s3 = _bfr->get_line(); // Start of line 3 (read) -- const char *s4 = strchr( s3, '\n' )+1;// Start of line 4 (unread) -- if( len < (s4-s3) ) { // It all fits on the next 2 lines -- s2 = _bfr->get_line(); -- len = printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Line 2 -- s3 = _bfr->get_line(); -- printline( os, _bfr->_fp->_name, _line+2, s3, -1, len ); // Line 3 -- return; -- } -- -- // Here we require at least 4 lines. -- // Print only the 1st and last line, with ellipses in middle. -- os << "...\n"; // The ellipses -- int cline = _line+1; // Skipped 2 lines -- do { // Do until find last line -- len -= (int)(s3-s2); // Remove length of line -- cline++; // Next line -- s2 = _bfr->get_line(); // Get next line from end of this line -- s3 = strchr( s2, '\n' ) + 1;// Get end of next line -- } while( len > (s3-s2) ); // Repeat until last line -- printline( os, _bfr->_fp->_name, cline, s2, -1, len ); // Print & underline --} -- - //------------------------------file_error------------------------------------- - void FileBuff::file_error(int flag, int linenum, const char *fmt, ...) - { -diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.hpp ---- hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 08:59:57 2014 -0400 -+++ hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 09:56:55 2014 -0400 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -46,7 +46,6 @@ - // This class defines a nicely behaved buffer of text. Entire file of text - // is read into buffer at creation, with sentinels at start and end. - class FileBuff { -- friend class FileBuffRegion; - private: - long _bufferSize; // Size of text holding buffer. - long _offset; // Expected filepointer offset. -@@ -82,29 +81,4 @@ - // when the pointer is valid (i.e. just obtained from getline()). - long getoff(const char* s) { return _bufoff + (long)(s - _buf); } - }; -- --//------------------------------FileBuffRegion--------------------------------- --// A buffer region is really a region of some file, specified as a linked list --// of offsets and lengths. These regions can be merged; overlapping regions --// will coalesce. --class FileBuffRegion { -- public: // Workaround dev-studio friend/private bug -- FileBuffRegion *_next; // Linked list of regions sorted by offset. -- private: -- FileBuff *_bfr; // The Buffer of the file -- int _offset, _length; // The file area -- int _sol; // Start of line where the file area starts -- int _line; // First line of region -- -- public: -- FileBuffRegion(FileBuff*, int sol, int line, int offset, int len); -- ~FileBuffRegion(); -- -- FileBuffRegion *copy(); // Deep copy -- FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input -- -- void print(ostream&); -- friend ostream& operator<< (ostream&, FileBuffRegion&); --}; -- - #endif // SHARE_VM_ADLC_FILEBUFF_HPP - Property changes on: head/java/openjdk7/files/patch-remove-FileBuffRegion ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/openjdk8/Makefile =================================================================== --- head/java/openjdk8/Makefile (revision 374823) +++ head/java/openjdk8/Makefile (revision 374824) @@ -1,245 +1,248 @@ # $FreeBSD$ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ LOCAL/jkim:jdk,jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} DISTNAME= ${PORTNAME}-${JDK_MAJOR_VERSION}-src-b${DIST_BUILD_NUMBER}-03_mar_2014 DISTFILES= ${DISTNAME}.zip:jdk MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client \ bash:${PORTSDIR}/shells/bash LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libgif.so:${PORTSDIR}/graphics/giflib RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu USES= compiler:features dos2unix gmake iconv pkgconfig shebangfix USE_AUTOTOOLS= autoconf USE_XORG= x11 xext xi xrender xt xtst .if !exists(/usr/bin/unzip) BUILD_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip .endif ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/${PORTNAME} DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \ jdk/src/bsd/doc/man/java.1 \ jdk/src/bsd/doc/man/javac.1 \ jdk/src/bsd/doc/man/javap.1 \ jdk/src/linux/doc/man/java.1 \ jdk/src/linux/doc/man/javac.1 \ jdk/src/linux/doc/man/javap.1 \ jdk/src/solaris/doc/sun/man/man1/java.1 \ jdk/src/solaris/doc/sun/man/man1/javac.1 \ jdk/src/solaris/doc/sun/man/man1/javap.1 \ nashorn/test/script/jfx.js SHEBANG_FILES= configure _MAKE_JOBS= # CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= LANG="C" LC_ALL="C" MAKE_ENV+= CLASSPATH="" JAVA_HOME="" LD_LIBRARY_PATH="" MAKEFLAGS="" MAKE_ENV+= IGNORE_OLD_CONFIG=true JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-server-${JDK_BUILD_TYPE} .if !defined(BUILD_JRE) JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/j2sdk-image JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2sdk-image/jre .else JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2re-image .endif JDK_OSARCH= bsd-${ARCH:S/i386/x86/:S/amd64/x86_64/} INSTALLDIR= ${PREFIX}/${PKGBASE} NO_CCACHE= yes NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 JDK_UPDATE_VERSION= 25 JDK_BUILD_NUMBER= 17 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 JTREG_JENKINS_BUILD= 77 CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} CONFIGURE_ARGS+= --with-build-number="b${JDK_BUILD_NUMBER}" .if ${JDK_UPDATE_VERSION} > 0 CONFIGURE_ARGS+= --with-update-version=${JDK_UPDATE_VERSION} .endif CONFIGURE_ARGS+= --disable-ccache \ --disable-freetype-bundling \ --disable-zip-debug-info \ --with-alsa=${LOCALBASE} \ --with-cacerts-file=${FILESDIR}/cacerts \ --with-cups=${LOCALBASE} \ --with-debug-level=${JDK_BUILD_TYPE} \ --with-freetype=${LOCALBASE} \ --with-freetype-include=${LOCALBASE}/include/freetype2 \ --with-giflib=system \ --with-jobs=${MAKE_JOBS_NUMBER} \ --with-milestone=fcs \ --with-zlib=system CONFIGURE_SCRIPT= ../../configure CONFIGURE_WRKSRC= ${WRKSRC}/common/autoconf OPTIONS_DEFINE= POLICY TZUPDATE OPTIONS_DEFAULT= POLICY TZUPDATE POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data POLICY_CONFIGURE_ENABLE=unlimited-crypto TZUPDATE_RUN_DEPENDS= ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} .if !defined(BUILD_JRE) OPTIONS_DEFINE+= TEST OPTIONS_DEFAULT+= RELEASE OPTIONS_SINGLE= BUILD OPTIONS_SINGLE_BUILD= DEBUG DEBUGFAST RELEASE BUILD_DESC= Select OpenJDK build type DEBUG_DESC= Build for debugging (without optimizations) DEBUGFAST_DESC= Build for debugging (with optimizations) RELEASE_DESC= Build for release (default) TEST_DESC= Run regression tests RELEASE_CONFIGURE_ON= --disable-debug-symbols TEST_ALL_TARGET= test TEST_CONFIGURE_ON= --with-jtreg=${WRKDIR}/jtreg TEST_DISTFILES= jtreg${JTREG_VERSION}-${JTREG_BUILD_NUMBER}${EXTRACT_SUFX}:jtreg .else CONFIGURE_ARGS+= --disable-debug-symbols JAVAVMS_COMMENT+= JRE .endif .include .if ${PORT_OPTIONS:MDEBUG} JDK_BUILD_TYPE= slowdebug .elif ${PORT_OPTIONS:MDEBUGFAST} JDK_BUILD_TYPE= fastdebug .else JDK_BUILD_TYPE= release .endif .include BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \ ${LOCALBASE}/openjdk7 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} . if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) BOOTSTRAPJDKDIR= ${BJDK} . endif .endfor # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk7 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/openjdk7 .endif .if ${COMPILER_TYPE} == clang +.if ${COMPILER_VERSION} >= 35 +MAKE_ENV+= COMPILER_WARNINGS_FATAL=false +.endif MAKE_ENV+= USE_CLANG=true .if ${COMPILER_FEATURES:Mlibc++} CONFIGURE_ENV= LIBCXX="-lc++" .endif .endif .if empty(ICONV_LIB) ICONV_CPPFLAGS= -DLIBICONV_PLUG .else ICONV_CPPFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} .endif post-extract: @${CP} ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \ ${WRKSRC}/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg @${CP} ${FILESDIR}/nashorn-test-script-jfx-flyingimage-golden-bsd.png \ ${WRKSRC}/nashorn/test/script/jfx/flyingimage/golden/bsd.png @${CP} ${FILESDIR}/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png \ ${WRKSRC}/nashorn/test/script/jfx/kaleidoscope/golden/bsd.png @${CP} ${FILESDIR}/nashorn-test-script-jfx-spread-golden-bsd.png \ ${WRKSRC}/nashorn/test/script/jfx/spread/golden/bsd.png post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete @${RMDIR} ${WRKSRC}/jdk/src/macosx/classes/java/net \ ${WRKSRC}/jdk/src/macosx/native/sun/nio/ch \ ${WRKSRC}/jdk/src/macosx/native/sun/nio @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${FILESDIR}/bsd.fontconfig.properties.in > \ ${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/common/autoconf/toolchain.m4 \ ${WRKSRC}/configure \ ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \ ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java \ ${WRKSRC}/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java @${REINPLACE_CMD} -e 's|/usr/local/java/classes|${LOCALBASE}/share/java/classes|' \ ${WRKSRC}/jdk/src/bsd/doc/man/*.1 @${REINPLACE_CMD} -e 's|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|' \ -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk \ ${WRKSRC}/jdk/make/lib/CoreLibraries.gmk \ ${WRKSRC}/jdk/make/lib/ServiceabilityLibraries.gmk @${CHMOD} 755 ${WRKSRC}/configure post-build: .if !defined(BUILD_JRE) @${JDK_IMAGEDIR}/bin/jar cfe \ ${JRE_IMAGEDIR}/lib/compilefontconfig.jar \ build.tools.compilefontconfig.CompileFontConfig \ -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/compilefontconfig @${JDK_IMAGEDIR}/bin/jar cfe \ ${JRE_IMAGEDIR}/lib/javazic.jar \ build.tools.tzdb.TzdbZoneRulesCompiler \ -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/tzdb .endif .if ${PORT_OPTIONS:MTZUPDATE} @# Update time zones @${RM} -rf ${JRE_IMAGEDIR}/lib/zi @${LN} -sf ${LOCALBASE}/share/java/zi ${JRE_IMAGEDIR}/lib .endif do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} .if !defined(BUILD_JRE) @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} @cd ${STAGEDIR}${INSTALLDIR} && \ ${FIND} bin jre/bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \ ${CHMOD} ${BINMODE} jre/lib/${ARCH}/jexec \ jre/lib/${ARCH}/jspawnhelper lib/${ARCH}/jexec @${ECHO} "@dir ${INSTALLDIR}/jre/lib/applet" >> ${TMPPLIST} .else @cd ${JRE_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} @cd ${STAGEDIR}${INSTALLDIR} && \ ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \ ${CHMOD} ${BINMODE} lib/${ARCH}/jexec lib/${ARCH}/jspawnhelper @${ECHO} "@dir ${INSTALLDIR}/lib/applet" >> ${TMPPLIST} .endif @${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} @${FIND} -s ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} @${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST} .include Index: head/java/openjdk8/files/patch-remove-FileBuffRegion =================================================================== --- head/java/openjdk8/files/patch-remove-FileBuffRegion (revision 374823) +++ head/java/openjdk8/files/patch-remove-FileBuffRegion (nonexistent) @@ -1,270 +0,0 @@ - -# HG changeset patch -# User lfoltan -# Date 1399384615 14400 -# Node ID 21130eb5768d79c7f3a4ef0b9d976d1942de09ad -# Parent e7a6a3354c8409f739c52ffeb224bb59c1351b64 -8041620: Solaris Studio 12.4 C++ 5.13 change in behavior for placing friend declarations within surrounding scope. -Summary: Remove adlc's unused class FileBuffRegion. -Reviewed-by: coleenp, dholmes, kvn - -diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.cpp ---- hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 08:59:57 2014 -0400 -+++ hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 09:56:55 2014 -0400 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -89,200 +89,6 @@ - return retval; - } - --//------------------------------FileBuffRegion--------------------------------- --// Create a new region in a FileBuff. --FileBuffRegion::FileBuffRegion( FileBuff* bufr, int soln, int ln, -- int off, int len) --: _bfr(bufr), _sol(soln), _line(ln), _offset(off), _length(len) { -- _next = NULL; // No chained regions --} -- --//------------------------------~FileBuffRegion-------------------------------- --// Delete the entire linked list of buffer regions. --FileBuffRegion::~FileBuffRegion() { -- if( _next ) delete _next; --} -- --//------------------------------copy------------------------------------------- --// Deep copy a FileBuffRegion --FileBuffRegion *FileBuffRegion::copy() { -- if( !this ) return NULL; // The empty buffer region -- FileBuffRegion *br = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); -- if( _next ) br->_next = _next->copy(); -- return br; --} -- --//------------------------------merge------------------------------------------ --// Merge another buffer region into this buffer region. Make overlapping areas --// become a single region. Remove (delete) the input FileBuffRegion. --// Since the buffer regions are sorted by file offset, this is a varient of a --// "sorted-merge" running in linear time. --FileBuffRegion *FileBuffRegion::merge( FileBuffRegion *br ) { -- if( !br ) return this; // Merging nothing -- if( !this ) return br; // Merging into nothing -- -- assert( _bfr == br->_bfr, "" ); // Check for pointer-equivalent buffers -- -- if( _offset < br->_offset ) { // "this" starts before "br" -- if( _offset+_length < br->_offset ) { // "this" ends before "br" -- if( _next ) _next->merge( br ); // Merge with remainder of list -- else _next = br; // No more in this list; just append. -- } else { // Regions overlap. -- int l = br->_offset + br->_length - _offset; -- if( l > _length ) _length = l; // Pick larger region -- FileBuffRegion *nr = br->_next; // Get rest of region -- br->_next = NULL; // Remove indication of rest of region -- delete br; // Delete this region (it's been subsumed). -- if( nr ) merge( nr ); // Merge with rest of region -- } // End of if regions overlap or not. -- } else { // "this" starts after "br" -- if( br->_offset+br->_length < _offset ) { // "br" ends before "this" -- FileBuffRegion *nr = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); -- nr->_next = _next; // Structure copy "this" guy to "nr" -- *this = *br; // Structure copy "br" over "this". -- br->_next = NULL; // Remove indication of rest of region -- delete br; // Delete this region (it's been copied) -- merge( nr ); // Finish merging -- } else { // Regions overlap. -- int l = _offset + _length - br->_offset; -- if( l > _length ) _length = l; // Pick larger region -- _offset = br->_offset; // Start with earlier region -- _sol = br->_sol; // Also use earlier line start -- _line = br->_line; // Also use earlier line -- FileBuffRegion *nr = br->_next; // Get rest of region -- br->_next = NULL; // Remove indication of rest of region -- delete br; // Delete this region (it's been subsumed). -- if( nr ) merge( nr ); // Merge with rest of region -- } // End of if regions overlap or not. -- } -- return this; --} -- --//------------------------------expandtab-------------------------------------- --static int expandtab( ostream &os, int off, char c, char fill1, char fill2 ) { -- if( c == '\t' ) { // Tab? -- do os << fill1; // Expand the tab; Output space -- while( (++off) & 7 ); // Expand to tab stop -- } else { // Normal character -- os << fill2; // Display normal character -- off++; // Increment "cursor" offset -- } -- return off; --} -- --//------------------------------printline-------------------------------------- --// Print and highlite a region of a line. Return the amount of highliting left --// to do (i.e. highlite length minus length of line). --static int printline( ostream& os, const char *fname, int line, -- const char *_sol, int skip, int len ) { -- -- // Display the entire tab-expanded line -- os << fname << ":" << line << ": "; -- const char *t = strchr(_sol,'\n')+1; // End of line -- int off = 0; // Cursor offset for tab expansion -- const char *s = _sol; // Nice string pointer -- while( t-s ) { // Display whole line -- char c = *s++; // Get next character to display -- off = expandtab(os,off,c,' ',c); -- } -- -- // Display the tab-expanded skippings before underlining. -- os << fname << ":" << line << ": "; -- off = 0; // Cursor offset for tab expansion -- s = _sol; // Restart string pointer -- -- // Start underlining. -- if( skip != -1 ) { // The no-start-indicating flag -- const char *u = _sol+skip; // Amount to skip -- while( u-s ) // Display skipped part -- off = expandtab(os,off,*s++,' ',' '); -- os << '^'; // Start region -- off++; // Moved cursor -- len--; // 1 less char to do -- if( *s++ == '\t' ) // Starting character is a tab? -- off = expandtab(os,off,'\t','-','^'); -- } -- -- // Long region doesn't end on this line -- int llen = (int)(t-s); // Length of line, minus what's already done -- if( len > llen ) { // Doing entire rest of line? -- while( t-s ) // Display rest of line -- off = expandtab(os,off,*s++,'-','-'); -- os << '\n'; // EOL -- return len-llen; // Return what's not yet done. -- } -- -- // Region does end on this line. This code fails subtly if the region ends -- // in a tab character. -- int i; -- for( i=1; iprint(os); // Print region -- brp = brp->_next; // Chain to next -- } -- return os; // Return final stream --} -- --//------------------------------print------------------------------------------ --// Print the FileBuffRegion to a stream. FileBuffRegions are printed with the --// filename and line number to the left, and complete text lines to the right. --// Selected portions (portions of a line actually in the FileBuffRegion are --// underlined. Ellipses are used for long multi-line regions. --//void FileBuffRegion::print( std::ostream& os ) { --void FileBuffRegion::print( ostream& os ) { -- if( !this ) return; // Nothing to print -- char *s = _bfr->get_line(); -- int skip = (int)(_offset - _sol); // Amount to skip to start of data -- int len = printline( os, _bfr->_fp->_name, _line, s, skip, _length ); -- -- if( !len ) return; // All done; exit -- -- // Here we require at least 2 lines -- int off1 = _length - len + skip; // Length of line 1 -- int off2 = off1 + _sol; // Offset to start of line 2 -- char *s2 = _bfr->get_line(); // Start of line 2 -- char *s3 = strchr( s2, '\n' )+1; // Start of line 3 (unread) -- if( len <= (s3-s2) ) { // It all fits on the next line -- printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Print&underline -- return; -- } -- -- // Here we require at least 3 lines -- int off3 = off2 + (int)(s3-s2); // Offset to start of line 3 -- s3 = _bfr->get_line(); // Start of line 3 (read) -- const char *s4 = strchr( s3, '\n' )+1;// Start of line 4 (unread) -- if( len < (s4-s3) ) { // It all fits on the next 2 lines -- s2 = _bfr->get_line(); -- len = printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Line 2 -- s3 = _bfr->get_line(); -- printline( os, _bfr->_fp->_name, _line+2, s3, -1, len ); // Line 3 -- return; -- } -- -- // Here we require at least 4 lines. -- // Print only the 1st and last line, with ellipses in middle. -- os << "...\n"; // The ellipses -- int cline = _line+1; // Skipped 2 lines -- do { // Do until find last line -- len -= (int)(s3-s2); // Remove length of line -- cline++; // Next line -- s2 = _bfr->get_line(); // Get next line from end of this line -- s3 = strchr( s2, '\n' ) + 1;// Get end of next line -- } while( len > (s3-s2) ); // Repeat until last line -- printline( os, _bfr->_fp->_name, cline, s2, -1, len ); // Print & underline --} -- - //------------------------------file_error------------------------------------- - void FileBuff::file_error(int flag, int linenum, const char *fmt, ...) - { -diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.hpp ---- hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 08:59:57 2014 -0400 -+++ hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 09:56:55 2014 -0400 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -46,7 +46,6 @@ - // This class defines a nicely behaved buffer of text. Entire file of text - // is read into buffer at creation, with sentinels at start and end. - class FileBuff { -- friend class FileBuffRegion; - private: - long _bufferSize; // Size of text holding buffer. - long _offset; // Expected filepointer offset. -@@ -82,29 +81,4 @@ - // when the pointer is valid (i.e. just obtained from getline()). - long getoff(const char* s) { return _bufoff + (long)(s - _buf); } - }; -- --//------------------------------FileBuffRegion--------------------------------- --// A buffer region is really a region of some file, specified as a linked list --// of offsets and lengths. These regions can be merged; overlapping regions --// will coalesce. --class FileBuffRegion { -- public: // Workaround dev-studio friend/private bug -- FileBuffRegion *_next; // Linked list of regions sorted by offset. -- private: -- FileBuff *_bfr; // The Buffer of the file -- int _offset, _length; // The file area -- int _sol; // Start of line where the file area starts -- int _line; // First line of region -- -- public: -- FileBuffRegion(FileBuff*, int sol, int line, int offset, int len); -- ~FileBuffRegion(); -- -- FileBuffRegion *copy(); // Deep copy -- FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input -- -- void print(ostream&); -- friend ostream& operator<< (ostream&, FileBuffRegion&); --}; -- - #endif // SHARE_VM_ADLC_FILEBUFF_HPP - Property changes on: head/java/openjdk8/files/patch-remove-FileBuffRegion ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property