pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Fix error observed in SmartOS bulk build.
details: https://anonhg.NetBSD.org/pkgsrc/rev/bfad1c5acc73
branches: trunk
changeset: 646527:bfad1c5acc73
user: tnn <tnn%pkgsrc.org@localhost>
date: Tue Feb 10 14:57:35 2015 +0000
description:
Fix error observed in SmartOS bulk build.
Note: PLIST.SunOS should list only files unique to SunOS, not duplicates.
XXX why does it bundle libfreetype.so.6? looks wrong.
diffstat:
lang/openjdk7/Makefile | 15 +-
lang/openjdk7/PLIST.SunOS | 1074 +---------
lang/openjdk7/distinfo | 3 +-
lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp | 24 +
4 files changed, 46 insertions(+), 1070 deletions(-)
diffs (truncated from 1185 to 300 lines):
diff -r ec360e01b50f -r bfad1c5acc73 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile Tue Feb 10 14:43:37 2015 +0000
+++ b/lang/openjdk7/Makefile Tue Feb 10 14:57:35 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2015/02/10 00:26:49 tnn Exp $
+# $NetBSD: Makefile,v 1.92 2015/02/10 14:57:35 tnn Exp $
DISTNAME= openjdk-1.7.76-20150127
PKGNAME= openjdk7-1.7.76
@@ -59,12 +59,15 @@
MAKE_ENV+= JAVA_HOME=
MAKE_ENV+= CLASSPATH=
-BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
-LD_LIBRARY_PATH=
${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server
+BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}
+BUILD_ARCH= ${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/:S/sparc64/sparcv9/}
+LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/}
+BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}
+LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server
MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk7/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk7/jre/lib/${LIBDIR_ARCH}
-PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/}
+PLIST_SUBST+= ARCH=${LIBDIR_ARCH}
PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS}
.include "../../mk/compiler.mk"
@@ -187,7 +190,7 @@
${LN} -s ${JDK_BOOTDIR}/bin/native2ascii ${ALT_BOOTDIR}/bin
${LN} -s ${JDK_BOOTDIR}/bin/rmic ${ALT_BOOTDIR}/bin
.elif ${OPSYS} == "NetBSD" && exists(${.CURDIR}/libs)
- cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}
+ cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
diff -r ec360e01b50f -r bfad1c5acc73 lang/openjdk7/PLIST.SunOS
--- a/lang/openjdk7/PLIST.SunOS Tue Feb 10 14:43:37 2015 +0000
+++ b/lang/openjdk7/PLIST.SunOS Tue Feb 10 14:57:35 2015 +0000
@@ -1,1087 +1,35 @@
-@comment $NetBSD: PLIST.SunOS,v 1.5 2015/02/08 23:40:09 tnn Exp $
-bin/openjdk7-jar
-bin/openjdk7-java
-bin/openjdk7-javac
-bin/openjdk7-javadoc
-bin/openjdk7-javah
-bin/openjdk7-javap
-bin/openjdk7-keytool
-bin/openjdk7-orbd
-bin/openjdk7-policytool
-bin/openjdk7-rmid
-bin/openjdk7-rmiregistry
-bin/openjdk7-servertool
-bin/openjdk7-tnameserv
-java/openjdk7/ASSEMBLY_EXCEPTION
-java/openjdk7/LICENSE
-java/openjdk7/THIRD_PARTY_README
-${PLIST.x11}java/openjdk7/bin/appletviewer
-java/openjdk7/bin/apt
-java/openjdk7/bin/extcheck
-java/openjdk7/bin/idlj
-java/openjdk7/bin/jar
-java/openjdk7/bin/jarsigner
-java/openjdk7/bin/java
-java/openjdk7/bin/java-rmi.cgi
-java/openjdk7/bin/javac
-java/openjdk7/bin/javadoc
-java/openjdk7/bin/javah
-java/openjdk7/bin/javap
-java/openjdk7/bin/jcmd
-java/openjdk7/bin/jconsole
-java/openjdk7/bin/jdb
-java/openjdk7/bin/jhat
-java/openjdk7/bin/jinfo
-java/openjdk7/bin/jmap
-java/openjdk7/bin/jps
-java/openjdk7/bin/jrunscript
-java/openjdk7/bin/jsadebugd
-java/openjdk7/bin/jstack
-java/openjdk7/bin/jstat
-java/openjdk7/bin/jstatd
-java/openjdk7/bin/keytool
-java/openjdk7/bin/native2ascii
-java/openjdk7/bin/orbd
-java/openjdk7/bin/pack200
-${PLIST.x11}java/openjdk7/bin/policytool
-java/openjdk7/bin/rmic
-java/openjdk7/bin/rmid
-java/openjdk7/bin/rmiregistry
-java/openjdk7/bin/schemagen
-java/openjdk7/bin/serialver
-java/openjdk7/bin/servertool
-java/openjdk7/bin/tnameserv
-java/openjdk7/bin/unpack200
-java/openjdk7/bin/wsgen
-java/openjdk7/bin/wsimport
-java/openjdk7/bin/xjc
-java/openjdk7/demo/README
-java/openjdk7/demo/applets/ArcTest/ArcCanvas.class
-java/openjdk7/demo/applets/ArcTest/ArcControls.class
-java/openjdk7/demo/applets/ArcTest/ArcTest.class
-java/openjdk7/demo/applets/ArcTest/ArcTest.java
-java/openjdk7/demo/applets/ArcTest/IntegerTextField.class
-java/openjdk7/demo/applets/ArcTest/example1.html
-java/openjdk7/demo/applets/BarChart/BarChart.class
-java/openjdk7/demo/applets/BarChart/BarChart.java
-java/openjdk7/demo/applets/BarChart/example1.html
-java/openjdk7/demo/applets/BarChart/example2.html
-java/openjdk7/demo/applets/Blink/Blink$1.class
-java/openjdk7/demo/applets/Blink/Blink.class
-java/openjdk7/demo/applets/Blink/Blink.java
-java/openjdk7/demo/applets/Blink/example1.html
-java/openjdk7/demo/applets/CardTest/CardPanel.class
-java/openjdk7/demo/applets/CardTest/CardTest.class
-java/openjdk7/demo/applets/CardTest/CardTest.java
-java/openjdk7/demo/applets/CardTest/example1.html
-java/openjdk7/demo/applets/Clock/Clock.class
-java/openjdk7/demo/applets/Clock/Clock.java
-java/openjdk7/demo/applets/Clock/example1.html
-java/openjdk7/demo/applets/DitherTest/CardinalTextField.class
-java/openjdk7/demo/applets/DitherTest/DitherCanvas.class
-java/openjdk7/demo/applets/DitherTest/DitherControls.class
-java/openjdk7/demo/applets/DitherTest/DitherMethod.class
-java/openjdk7/demo/applets/DitherTest/DitherTest$1.class
-java/openjdk7/demo/applets/DitherTest/DitherTest.class
-java/openjdk7/demo/applets/DitherTest/DitherTest.java
-java/openjdk7/demo/applets/DitherTest/example1.html
-java/openjdk7/demo/applets/DrawTest/DrawControls.class
-java/openjdk7/demo/applets/DrawTest/DrawPanel.class
-java/openjdk7/demo/applets/DrawTest/DrawTest.class
-java/openjdk7/demo/applets/DrawTest/DrawTest.java
-java/openjdk7/demo/applets/DrawTest/example1.html
-java/openjdk7/demo/applets/Fractal/CLSFractal.class
-java/openjdk7/demo/applets/Fractal/CLSFractal.java
-java/openjdk7/demo/applets/Fractal/CLSRule.class
-java/openjdk7/demo/applets/Fractal/CLSTurtle.class
-java/openjdk7/demo/applets/Fractal/ContextLSystem.class
-java/openjdk7/demo/applets/Fractal/example1.html
-java/openjdk7/demo/applets/GraphicsTest/AppletFrame.class
-java/openjdk7/demo/applets/GraphicsTest/AppletFrame.java
-java/openjdk7/demo/applets/GraphicsTest/ArcCard.class
-java/openjdk7/demo/applets/GraphicsTest/ArcDegreePanel.class
-java/openjdk7/demo/applets/GraphicsTest/ArcPanel.class
-java/openjdk7/demo/applets/GraphicsTest/ColorUtils.class
-java/openjdk7/demo/applets/GraphicsTest/GraphicsCards.class
-java/openjdk7/demo/applets/GraphicsTest/GraphicsPanel.class
-java/openjdk7/demo/applets/GraphicsTest/GraphicsTest.class
-java/openjdk7/demo/applets/GraphicsTest/GraphicsTest.java
-java/openjdk7/demo/applets/GraphicsTest/OvalShape.class
-java/openjdk7/demo/applets/GraphicsTest/PolygonShape.class
-java/openjdk7/demo/applets/GraphicsTest/RectShape.class
-java/openjdk7/demo/applets/GraphicsTest/RoundRectShape.class
-java/openjdk7/demo/applets/GraphicsTest/Shape.class
-java/openjdk7/demo/applets/GraphicsTest/ShapeTest.class
-java/openjdk7/demo/applets/GraphicsTest/example1.html
-java/openjdk7/demo/applets/MoleculeViewer/Atom.class
-java/openjdk7/demo/applets/MoleculeViewer/Matrix3D.class
-java/openjdk7/demo/applets/MoleculeViewer/Matrix3D.java
-java/openjdk7/demo/applets/MoleculeViewer/XYZApp.class
-java/openjdk7/demo/applets/MoleculeViewer/XYZApp.java
-java/openjdk7/demo/applets/MoleculeViewer/XYZChemModel.class
-java/openjdk7/demo/applets/MoleculeViewer/example1.html
-java/openjdk7/demo/applets/MoleculeViewer/example2.html
-java/openjdk7/demo/applets/MoleculeViewer/example3.html
-java/openjdk7/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz
-java/openjdk7/demo/applets/MoleculeViewer/models/benzene.xyz
-java/openjdk7/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz
-java/openjdk7/demo/applets/MoleculeViewer/models/cyclohexane.xyz
-java/openjdk7/demo/applets/MoleculeViewer/models/ethane.xyz
-java/openjdk7/demo/applets/MoleculeViewer/models/water.xyz
-java/openjdk7/demo/applets/NervousText/NervousText.class
-java/openjdk7/demo/applets/NervousText/NervousText.java
-java/openjdk7/demo/applets/NervousText/example1.html
-java/openjdk7/demo/applets/SimpleGraph/GraphApplet.class
-java/openjdk7/demo/applets/SimpleGraph/GraphApplet.java
-java/openjdk7/demo/applets/SimpleGraph/example1.html
-java/openjdk7/demo/applets/SortDemo/BidirBubbleSortAlgorithm.class
-java/openjdk7/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java
-java/openjdk7/demo/applets/SortDemo/BubbleSortAlgorithm.class
-java/openjdk7/demo/applets/SortDemo/BubbleSortAlgorithm.java
-java/openjdk7/demo/applets/SortDemo/QSortAlgorithm.class
-java/openjdk7/demo/applets/SortDemo/QSortAlgorithm.java
-java/openjdk7/demo/applets/SortDemo/SortAlgorithm.class
-java/openjdk7/demo/applets/SortDemo/SortAlgorithm.java
-java/openjdk7/demo/applets/SortDemo/SortItem.class
-java/openjdk7/demo/applets/SortDemo/SortItem.java
-java/openjdk7/demo/applets/SortDemo/example1.html
-java/openjdk7/demo/applets/SpreadSheet/Cell.class
-java/openjdk7/demo/applets/SpreadSheet/CellUpdater.class
-java/openjdk7/demo/applets/SpreadSheet/InputField.class
-java/openjdk7/demo/applets/SpreadSheet/Node.class
-java/openjdk7/demo/applets/SpreadSheet/SpreadSheet.class
-java/openjdk7/demo/applets/SpreadSheet/SpreadSheet.java
-java/openjdk7/demo/applets/SpreadSheet/SpreadSheetInput.class
-java/openjdk7/demo/applets/SpreadSheet/example1.html
-java/openjdk7/demo/applets/WireFrame/FileFormatException.class
-java/openjdk7/demo/applets/WireFrame/Matrix3D.class
-java/openjdk7/demo/applets/WireFrame/Matrix3D.java
-java/openjdk7/demo/applets/WireFrame/Model3D.class
-java/openjdk7/demo/applets/WireFrame/ThreeD.class
-java/openjdk7/demo/applets/WireFrame/ThreeD.java
-java/openjdk7/demo/applets/WireFrame/example1.html
-java/openjdk7/demo/applets/WireFrame/example2.html
-java/openjdk7/demo/applets/WireFrame/example3.html
-java/openjdk7/demo/applets/WireFrame/example4.html
-java/openjdk7/demo/applets/WireFrame/models/cube.obj
-java/openjdk7/demo/applets/WireFrame/models/dinasaur.obj
-java/openjdk7/demo/applets/WireFrame/models/hughes_500.obj
-java/openjdk7/demo/applets/WireFrame/models/knoxS.obj
-java/openjdk7/demo/jfc/CodePointIM/CodePointIM.jar
-java/openjdk7/demo/jfc/CodePointIM/README.html
-java/openjdk7/demo/jfc/CodePointIM/README_ja.html
-java/openjdk7/demo/jfc/CodePointIM/README_zh_CN.html
-java/openjdk7/demo/jfc/CodePointIM/src.zip
-java/openjdk7/demo/jfc/FileChooserDemo/FileChooserDemo.jar
-java/openjdk7/demo/jfc/FileChooserDemo/README.txt
-java/openjdk7/demo/jfc/FileChooserDemo/src.zip
-java/openjdk7/demo/jfc/Font2DTest/Font2DTest.html
-java/openjdk7/demo/jfc/Font2DTest/Font2DTest.jar
-java/openjdk7/demo/jfc/Font2DTest/README.txt
-java/openjdk7/demo/jfc/Font2DTest/src.zip
-java/openjdk7/demo/jfc/Metalworks/Metalworks.jar
-java/openjdk7/demo/jfc/Metalworks/README.txt
-java/openjdk7/demo/jfc/Metalworks/src.zip
-java/openjdk7/demo/jfc/Notepad/Notepad.jar
-java/openjdk7/demo/jfc/Notepad/README.txt
-java/openjdk7/demo/jfc/Notepad/src.zip
-java/openjdk7/demo/jfc/SampleTree/README.txt
-java/openjdk7/demo/jfc/SampleTree/SampleTree.jar
-java/openjdk7/demo/jfc/SampleTree/src.zip
-java/openjdk7/demo/jfc/SwingApplet/README.txt
-java/openjdk7/demo/jfc/SwingApplet/SwingApplet.html
-java/openjdk7/demo/jfc/SwingApplet/SwingApplet.jar
-java/openjdk7/demo/jfc/SwingApplet/src.zip
-java/openjdk7/demo/jfc/TableExample/README.txt
-java/openjdk7/demo/jfc/TableExample/TableExample.jar
-java/openjdk7/demo/jfc/TableExample/src.zip
-java/openjdk7/demo/jfc/TransparentRuler/README.txt
-java/openjdk7/demo/jfc/TransparentRuler/TransparentRuler.jar
-java/openjdk7/demo/jfc/TransparentRuler/src.zip
+@comment $NetBSD: PLIST.SunOS,v 1.6 2015/02/10 14:57:35 tnn Exp $
+java/openjdk7/demo/jni/Poller/lib/libPoller.so
java/openjdk7/demo/jni/Poller/Poller.jar
java/openjdk7/demo/jni/Poller/README.txt
-java/openjdk7/demo/jni/Poller/lib/libPoller.so
java/openjdk7/demo/jni/Poller/src.zip
-java/openjdk7/demo/jpda/com/sun/tools/example/README
-java/openjdk7/demo/jpda/examples.jar
-java/openjdk7/demo/jpda/src.zip
-java/openjdk7/demo/jvmti/compiledMethodLoad/README.txt
-java/openjdk7/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
-java/openjdk7/demo/jvmti/compiledMethodLoad/src.zip
-java/openjdk7/demo/jvmti/gctest/README.txt
-java/openjdk7/demo/jvmti/gctest/lib/libgctest.so
-java/openjdk7/demo/jvmti/gctest/src.zip
-java/openjdk7/demo/jvmti/heapTracker/README.txt
-java/openjdk7/demo/jvmti/heapTracker/heapTracker.jar
-java/openjdk7/demo/jvmti/heapTracker/lib/libheapTracker.so
-java/openjdk7/demo/jvmti/heapTracker/src.zip
-java/openjdk7/demo/jvmti/heapViewer/README.txt
-java/openjdk7/demo/jvmti/heapViewer/lib/libheapViewer.so
-java/openjdk7/demo/jvmti/heapViewer/src.zip
-java/openjdk7/demo/jvmti/hprof/README.txt
-java/openjdk7/demo/jvmti/hprof/lib/libhprof.so
-java/openjdk7/demo/jvmti/hprof/src.zip
-java/openjdk7/demo/jvmti/index.html
-java/openjdk7/demo/jvmti/minst/README.txt
-java/openjdk7/demo/jvmti/minst/lib/libminst.so
-java/openjdk7/demo/jvmti/minst/minst.jar
-java/openjdk7/demo/jvmti/minst/src.zip
-java/openjdk7/demo/jvmti/mtrace/README.txt
-java/openjdk7/demo/jvmti/mtrace/lib/libmtrace.so
-java/openjdk7/demo/jvmti/mtrace/mtrace.jar
-java/openjdk7/demo/jvmti/mtrace/src.zip
-java/openjdk7/demo/jvmti/versionCheck/README.txt
-java/openjdk7/demo/jvmti/versionCheck/lib/libversionCheck.so
-java/openjdk7/demo/jvmti/versionCheck/src.zip
-java/openjdk7/demo/jvmti/waiters/README.txt
-java/openjdk7/demo/jvmti/waiters/lib/libwaiters.so
-java/openjdk7/demo/jvmti/waiters/src.zip
-java/openjdk7/demo/management/FullThreadDump/FullThreadDump.jar
-java/openjdk7/demo/management/FullThreadDump/README.txt
-java/openjdk7/demo/management/FullThreadDump/src.zip
-java/openjdk7/demo/management/JTop/JTop.jar
-java/openjdk7/demo/management/JTop/README.txt
-java/openjdk7/demo/management/JTop/src.zip
-java/openjdk7/demo/management/MemoryMonitor/MemoryMonitor.jar
-java/openjdk7/demo/management/MemoryMonitor/README.txt
-java/openjdk7/demo/management/MemoryMonitor/src.zip
-java/openjdk7/demo/management/VerboseGC/README.txt
-java/openjdk7/demo/management/VerboseGC/VerboseGC.jar
-java/openjdk7/demo/management/VerboseGC/src.zip
-java/openjdk7/demo/management/index.html
-java/openjdk7/demo/nbproject/README.txt
-java/openjdk7/demo/nbproject/jfc/FileChooserDemo/build.properties
-java/openjdk7/demo/nbproject/jfc/FileChooserDemo/build.xml
-java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml
-java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml
Home |
Main Index |
Thread Index |
Old Index