diff options
author | marino <marino@pkgsrc.org> | 2012-05-16 08:55:45 +0000 |
---|---|---|
committer | marino <marino@pkgsrc.org> | 2012-05-16 08:55:45 +0000 |
commit | 70fe15c72d49dd20f7c7278eb3c70c536c3d4d43 (patch) | |
tree | ba95a0455be2170269656a937384fd0044cda69d /lang | |
parent | 700685c3b50c2be93f2ca3755fc887a9939712c1 (diff) | |
download | pkgsrc-70fe15c72d49dd20f7c7278eb3c70c536c3d4d43.tar.gz |
PR#45836 lang/openjd7: Repack DragonFly bootstraps
OpenJDK7 wouldn't build on DragonFly for non-root users due to a conflict
with the bootstrap/LICENSE file. Both the -bin-common and the
-bin-dragonfly bootstraps contained the same file, both with 444 file
permissions. As a result, the extraction phase fails for non-root pbulk
builds and other under-privileged users.
The DragonFly bootstraps were repacked to exclude the duplicate
bootstrap/LICENSE file, and the bootstrap.mk file updated accordingly.
The new bootstraps are packed with xz, resulting in a tarball 6MB
smaller for i386.
Other changes while we're here:
1) Add LICENSE=gnu-gpl-v2
2) USE_TOOLS+= patch (pkglint complained)
3) Fix ONLY_FOR_PLATFORM triplet for DragonFly (pkglint complained)
Diffstat (limited to 'lang')
-rw-r--r-- | lang/openjdk7/Makefile | 5 | ||||
-rw-r--r-- | lang/openjdk7/bootstrap.mk | 8 | ||||
-rw-r--r-- | lang/openjdk7/distinfo | 14 |
3 files changed, 14 insertions, 13 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 5476be89454..99f8670b086 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2012/05/12 21:01:47 marino Exp $ +# $NetBSD: Makefile,v 1.34 2012/05/16 08:55:45 marino Exp $ DISTNAME= openjdk-7-fcs-src-b147-27_jun_2011 PKGNAME= openjdk7-1.7.0.147.20110811 @@ -10,6 +10,7 @@ EXTRACT_SUFX= .tar.bz2 OWNER= tnn@NetBSD.org HOMEPAGE= http://openjdk.java.net/ COMMENT= Open-source implementation of the Java Platform, Standard Edition +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir @@ -40,7 +41,7 @@ DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf NO_CONFIGURE= yes USE_LANGUAGES= c c++ -USE_TOOLS+= gmake pax unzip:run zip:run +USE_TOOLS+= gmake pax unzip:run zip:run patch UNLIMIT_RESOURCES= datasize stacksize WRKSRC= ${WRKDIR}/openjdk diff --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk index 96f4c4bb976..4f9f4f968db 100644 --- a/lang/openjdk7/bootstrap.mk +++ b/lang/openjdk7/bootstrap.mk @@ -1,15 +1,15 @@ -# $NetBSD: bootstrap.mk,v 1.6 2012/05/12 21:01:47 marino Exp $ +# $NetBSD: bootstrap.mk,v 1.7 2012/05/16 08:55:45 marino Exp $ ONLY_FOR_PLATFORM= NetBSD-[56].*-i386 NetBSD-[56].*-x86_64 -ONLY_FOR_PLATFORM+= DragonFly-[23].* +ONLY_FOR_PLATFORM+= DragonFly-[23].*-* BOOT.nb5-i386= bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2 BOOT.nb5-amd64= bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2 BOOT.nb6-i386= bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2 BOOT.nb6-amd64= bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2 -BOOT.df213-i386= bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811.tar.bz2 +BOOT.df213-i386= bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz # 1.7 partial bootstrap: -BOOT.df213-amd64= bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811.tar.bz2 +BOOT.df213-amd64= bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz BOOT.common-20110811= bootstrap-jdk7-bin-common-20110811.tar.bz2 .if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo) diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 043bd61f5cd..92e4cd5ca07 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2012/05/12 21:01:47 marino Exp $ +$NetBSD: distinfo,v 1.15 2012/05/16 08:55:45 marino Exp $ SHA1 (openjdk7/61e08e67b176.tar.bz2) = 3db5488f3c0ea1b9c83a74632d300d8717c9b478 RMD160 (openjdk7/61e08e67b176.tar.bz2) = c0dd67a6ae982f09b3675c164b5decab4f7e140f @@ -15,12 +15,12 @@ Size (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 6702817 bytes SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2 RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7 Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes -SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811.tar.bz2) = 69ca558e447d89bcd9bf498b620e943fca27068e -RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811.tar.bz2) = 65c3a00037486efc3076ec60d45a2a15ad1a8572 -Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811.tar.bz2) = 4106969 bytes -SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811.tar.bz2) = 8550a0c10bebd6843a926aad1a1eb619689e8936 -RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811.tar.bz2) = e4e889d6c818f2e83939a04cb31fbeaca8eda278 -Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811.tar.bz2) = 9285042 bytes +SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4 +RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe +Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes +SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 08d0003078162c038ed67bb3d59cd2e4073cf4dd +RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 4ea4bd473635d99d9740c10bb815e019f7ad09d5 +Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 3422188 bytes SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = f7578bfdfc7a952cd83306c97fa87ebf921a0461 RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 74c570fa6ab6e175871229acc45edbb1e9c759ce Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 3837091 bytes |