pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Optionalize debug, X11 and ZeroVM simila...
details: https://anonhg.NetBSD.org/pkgsrc/rev/faceef0fd448
branches: trunk
changeset: 646457:faceef0fd448
user: tnn <tnn%pkgsrc.org@localhost>
date: Sun Feb 08 23:40:09 2015 +0000
description:
Optionalize debug, X11 and ZeroVM similar to lang/openjdk8 + minor cleanups
diffstat:
lang/openjdk7/Makefile | 24 +--
lang/openjdk7/PLIST | 67 +-------
lang/openjdk7/PLIST.SunOS | 84 +--------
lang/openjdk7/PLIST.debug | 37 ++++
lang/openjdk7/distinfo | 5 +-
lang/openjdk7/options.mk | 62 ++++++-
lang/openjdk7/patches/patch-ao | 34 ++-
lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_zeroshark.make | 12 +
8 files changed, 157 insertions(+), 168 deletions(-)
diffs (truncated from 647 to 300 lines):
diff -r b7308a84ad09 -r faceef0fd448 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile Sun Feb 08 23:04:22 2015 +0000
+++ b/lang/openjdk7/Makefile Sun Feb 08 23:40:09 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2015/02/08 07:57:55 tnn Exp $
+# $NetBSD: Makefile,v 1.89 2015/02/08 23:40:09 tnn Exp $
DISTNAME= openjdk-1.7.76-20150127
PKGNAME= openjdk7-1.7.76
@@ -15,12 +15,6 @@
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-# diff between distfile and bsd-port branch. To check out, use:
-# "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/";
-#PATCH_DIST_STRIP= -p1
-#PATCHFILES+= jdk-7u21-20130526.diff
-#PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/}
-
JAVA_NAME= openjdk7
JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \
@@ -30,9 +24,6 @@
MAKE_ENV+= PKGSRC_UNZIP=${TOOLS_PATH.unzip}
MAKE_ENV+= PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx
-DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
-#DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf
-#DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf
BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
NO_CONFIGURE= yes
@@ -40,6 +31,7 @@
USE_TOOLS+= gmake pax unzip:run zip:run # patch
UNLIMIT_RESOURCES= datasize stacksize
WRKSRC= ${WRKDIR}/openjdk
+PLIST_SRC+= ${PLIST_SRC_DFLT}
BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
PREPEND_PATH+= ${ALT_BOOTDIR}/bin
@@ -51,7 +43,6 @@
MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include
MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin
MAKE_ENV+= ALT_PACKAGE_PATH=${PREFIX}
-MAKE_ENV+= ALT_X11_PATH=${X11BASE}
MAKE_ENV+= RHINO_JAR=${WRKDIR}/${RHINO}/js.jar
MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1}
@@ -60,8 +51,6 @@
MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc
MAKE_ENV+= NO_DOCS=true
MAKE_ENV+= SKIP_COMPARE_IMAGES=true
-MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes
-MAKE_ENV+= SKIP_DEBUG_BUILD=yes
# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
MAKE_ENV+= JAVA_HOME=
@@ -163,13 +152,10 @@
SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g'
SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
-PLIST_VARS+= i386 jce manja
+PLIST_VARS+= i386
.if ${MACHINE_ARCH} == "i386"
PLIST.i386= yes
.endif
-.if ${OPSYS} != "SunOS"
-PLIST.manja= yes
-.endif
PLIST_VARS+= sctp alsa
.if ${OPSYS} == "FreeBSD"
@@ -209,7 +195,7 @@
# stage 1 builds a native JDK using the bootstrap binaries
${WRKDIR}/stage1-done:
- ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+ ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${JDK_MAKE_TARGET}
rm -rf ${ALT_BOOTDIR}
cd ${BUILDDIR} && mv j2sdk-image ${ALT_BOOTDIR}
mv ${BUILDDIR} ${BUILDDIR}-stage1
@@ -217,7 +203,7 @@
# stage 2 rebuilds the JDK using native tools
${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done
- ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+ ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${JDK_MAKE_TARGET}
touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep
touch ${WRKDIR}/stage2-done
diff -r b7308a84ad09 -r faceef0fd448 lang/openjdk7/PLIST
--- a/lang/openjdk7/PLIST Sun Feb 08 23:04:22 2015 +0000
+++ b/lang/openjdk7/PLIST Sun Feb 08 23:40:09 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2015/02/08 04:13:23 tnn Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/02/08 23:40:09 tnn Exp $
bin/openjdk7-jar
bin/openjdk7-java
bin/openjdk7-javac
@@ -15,7 +15,7 @@
java/openjdk7/ASSEMBLY_EXCEPTION
java/openjdk7/LICENSE
java/openjdk7/THIRD_PARTY_README
-java/openjdk7/bin/appletviewer
+${PLIST.x11}java/openjdk7/bin/appletviewer
java/openjdk7/bin/apt
java/openjdk7/bin/extcheck
java/openjdk7/bin/idlj
@@ -43,7 +43,7 @@
java/openjdk7/bin/native2ascii
java/openjdk7/bin/orbd
java/openjdk7/bin/pack200
-java/openjdk7/bin/policytool
+${PLIST.x11}java/openjdk7/bin/policytool
java/openjdk7/bin/rmic
java/openjdk7/bin/rmid
java/openjdk7/bin/rmiregistry
@@ -349,7 +349,7 @@
java/openjdk7/jre/bin/keytool
java/openjdk7/jre/bin/orbd
java/openjdk7/jre/bin/pack200
-java/openjdk7/jre/bin/policytool
+${PLIST.x11}java/openjdk7/jre/bin/policytool
java/openjdk7/jre/bin/rmid
java/openjdk7/jre/bin/rmiregistry
java/openjdk7/jre/bin/servertool
@@ -363,51 +363,42 @@
java/openjdk7/jre/lib/${ARCH}/jli/libjli.so
java/openjdk7/jre/lib/${ARCH}/jspawnhelper
java/openjdk7/jre/lib/${ARCH}/jvm.cfg
-java/openjdk7/jre/lib/${ARCH}/libattach.diz
java/openjdk7/jre/lib/${ARCH}/libattach.so
java/openjdk7/jre/lib/${ARCH}/libawt.so
-java/openjdk7/jre/lib/${ARCH}/libdt_socket.diz
java/openjdk7/jre/lib/${ARCH}/libdt_socket.so
java/openjdk7/jre/lib/${ARCH}/libfontmanager.so
-java/openjdk7/jre/lib/${ARCH}/libhprof.diz
java/openjdk7/jre/lib/${ARCH}/libhprof.so
-java/openjdk7/jre/lib/${ARCH}/libinstrument.diz
java/openjdk7/jre/lib/${ARCH}/libinstrument.so
java/openjdk7/jre/lib/${ARCH}/libj2gss.so
java/openjdk7/jre/lib/${ARCH}/libj2pcsc.so
java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.so
java/openjdk7/jre/lib/${ARCH}/libjaas_unix.so
java/openjdk7/jre/lib/${ARCH}/libjava.so
-java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.diz
java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.so
java/openjdk7/jre/lib/${ARCH}/libjawt.so
java/openjdk7/jre/lib/${ARCH}/libjdwp.so
java/openjdk7/jre/lib/${ARCH}/libjpeg.so
-java/openjdk7/jre/lib/${ARCH}/libjsdt.diz
java/openjdk7/jre/lib/${ARCH}/libjsdt.so
java/openjdk7/jre/lib/${ARCH}/libjsig.so
java/openjdk7/jre/lib/${ARCH}/libjsound.so
${PLIST.alsa}java/openjdk7/jre/lib/${ARCH}/libjsoundalsa.so
java/openjdk7/jre/lib/${ARCH}/liblcms.so
-java/openjdk7/jre/lib/${ARCH}/libmanagement.diz
java/openjdk7/jre/lib/${ARCH}/libmanagement.so
java/openjdk7/jre/lib/${ARCH}/libmlib_image.so
java/openjdk7/jre/lib/${ARCH}/libnet.so
java/openjdk7/jre/lib/${ARCH}/libnio.so
-java/openjdk7/jre/lib/${ARCH}/libnpt.diz
java/openjdk7/jre/lib/${ARCH}/libnpt.so
-java/openjdk7/jre/lib/${ARCH}/libsaproc.so
+${PLIST.native}java/openjdk7/jre/lib/${ARCH}/libsaproc.so
${PLIST.sctp}java/openjdk7/jre/lib/${ARCH}/libsctp.so
-java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
+${PLIST.x11}java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
java/openjdk7/jre/lib/${ARCH}/libsunec.so
java/openjdk7/jre/lib/${ARCH}/libunpack.so
-java/openjdk7/jre/lib/${ARCH}/libverify.diz
java/openjdk7/jre/lib/${ARCH}/libverify.so
java/openjdk7/jre/lib/${ARCH}/libzip.so
java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt
java/openjdk7/jre/lib/${ARCH}/server/libjsig.so
java/openjdk7/jre/lib/${ARCH}/server/libjvm.so
-java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so
+${PLIST.x11}java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so
java/openjdk7/jre/lib/applet/.keep
java/openjdk7/jre/lib/calendars.properties
java/openjdk7/jre/lib/charsets.jar
@@ -453,7 +444,6 @@
java/openjdk7/jre/lib/resources.jar
java/openjdk7/jre/lib/rhino.jar
java/openjdk7/jre/lib/rt.jar
-${PLIST.jce}java/openjdk7/jre/lib/security/README.txt
java/openjdk7/jre/lib/security/US_export_policy.jar
java/openjdk7/jre/lib/security/cacerts
java/openjdk7/jre/lib/security/java.policy
@@ -867,49 +857,8 @@
java/openjdk7/lib/ir.idl
java/openjdk7/lib/jconsole.jar
java/openjdk7/lib/orb.idl
-java/openjdk7/lib/sa-jdi.jar
+${PLIST.native}java/openjdk7/lib/sa-jdi.jar
java/openjdk7/lib/tools.jar
-java/openjdk7/man/ja
-${PLIST.manja}java/openjdk7/man/ja
-java/openjdk7/man/ja_JP.UTF-8/man1/appletviewer.1
-java/openjdk7/man/ja_JP.UTF-8/man1/apt.1
-java/openjdk7/man/ja_JP.UTF-8/man1/extcheck.1
-java/openjdk7/man/ja_JP.UTF-8/man1/idlj.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jar.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jarsigner.1
-java/openjdk7/man/ja_JP.UTF-8/man1/java.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javac.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javadoc.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javah.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javap.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jcmd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jconsole.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jdb.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jhat.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jinfo.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jmap.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jps.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jrunscript.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jsadebugd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jstack.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jstat.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jstatd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/keytool.1
-java/openjdk7/man/ja_JP.UTF-8/man1/native2ascii.1
-java/openjdk7/man/ja_JP.UTF-8/man1/orbd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/pack200.1
-java/openjdk7/man/ja_JP.UTF-8/man1/policytool.1
-java/openjdk7/man/ja_JP.UTF-8/man1/rmic.1
-java/openjdk7/man/ja_JP.UTF-8/man1/rmid.1
-java/openjdk7/man/ja_JP.UTF-8/man1/rmiregistry.1
-java/openjdk7/man/ja_JP.UTF-8/man1/schemagen.1
-java/openjdk7/man/ja_JP.UTF-8/man1/serialver.1
-java/openjdk7/man/ja_JP.UTF-8/man1/servertool.1
-java/openjdk7/man/ja_JP.UTF-8/man1/tnameserv.1
-java/openjdk7/man/ja_JP.UTF-8/man1/unpack200.1
-java/openjdk7/man/ja_JP.UTF-8/man1/wsgen.1
-java/openjdk7/man/ja_JP.UTF-8/man1/wsimport.1
-java/openjdk7/man/ja_JP.UTF-8/man1/xjc.1
java/openjdk7/man/man1/appletviewer.1
java/openjdk7/man/man1/apt.1
java/openjdk7/man/man1/extcheck.1
diff -r b7308a84ad09 -r faceef0fd448 lang/openjdk7/PLIST.SunOS
--- a/lang/openjdk7/PLIST.SunOS Sun Feb 08 23:04:22 2015 +0000
+++ b/lang/openjdk7/PLIST.SunOS Sun Feb 08 23:40:09 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2014/01/27 11:04:20 ryoon Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.5 2015/02/08 23:40:09 tnn Exp $
bin/openjdk7-jar
bin/openjdk7-java
bin/openjdk7-javac
@@ -15,7 +15,7 @@
java/openjdk7/ASSEMBLY_EXCEPTION
java/openjdk7/LICENSE
java/openjdk7/THIRD_PARTY_README
-java/openjdk7/bin/appletviewer
+${PLIST.x11}java/openjdk7/bin/appletviewer
java/openjdk7/bin/apt
java/openjdk7/bin/extcheck
java/openjdk7/bin/idlj
@@ -43,7 +43,7 @@
java/openjdk7/bin/native2ascii
java/openjdk7/bin/orbd
java/openjdk7/bin/pack200
-java/openjdk7/bin/policytool
+${PLIST.x11}java/openjdk7/bin/policytool
java/openjdk7/bin/rmic
java/openjdk7/bin/rmid
java/openjdk7/bin/rmiregistry
@@ -344,8 +344,8 @@
java/openjdk7/include/jni_md.h
java/openjdk7/include/jvmti.h
java/openjdk7/include/jvmticmlr.h
-java/openjdk7/include/solaris/jawt_md.h
-java/openjdk7/include/solaris/jni_md.h
+java/openjdk7/include/${LOWER_OPSYS}/jawt_md.h
+java/openjdk7/include/${LOWER_OPSYS}/jni_md.h
java/openjdk7/jre/ASSEMBLY_EXCEPTION
java/openjdk7/jre/LICENSE
java/openjdk7/jre/THIRD_PARTY_README
@@ -353,7 +353,7 @@
java/openjdk7/jre/bin/keytool
java/openjdk7/jre/bin/orbd
java/openjdk7/jre/bin/pack200
-java/openjdk7/jre/bin/policytool
+${PLIST.x11}java/openjdk7/jre/bin/policytool
java/openjdk7/jre/bin/rmid
java/openjdk7/jre/bin/rmiregistry
java/openjdk7/jre/bin/servertool
@@ -380,80 +380,57 @@
java/openjdk7/jre/lib/flavormap.properties
java/openjdk7/jre/lib/fontconfig.bfc
java/openjdk7/jre/lib/fontconfig.properties.src
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.so
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
Home |
Main Index |
Thread Index |
Old Index