Sun Jul 5 21:03:05 2015 UTC ()
Remove stale bits that are no longer needed (SunOS related).
Use HAS_CONFIGURE, as the configure script is not a standard GNU
script that pkgsrc expects and configure breaks with non-builtin libiconv.


(fhajny)
diff -r1.17 -r1.18 pkgsrc/lang/openjdk8/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/openjdk8/bootstrap.mk
cvs diff -r1.17 -r1.18 pkgsrc/lang/openjdk8/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/Makefile 2015/07/03 20:40:59 1.17
+++ pkgsrc/lang/openjdk8/Makefile 2015/07/05 21:03:05 1.18
@@ -1,55 +1,58 @@ @@ -1,55 +1,58 @@
1# $NetBSD: Makefile,v 1.17 2015/07/03 20:40:59 fhajny Exp $ 1# $NetBSD: Makefile,v 1.18 2015/07/05 21:03:05 fhajny Exp $
2 2
3DISTNAME= openjdk-1.8.45-20150610 3DISTNAME= openjdk-1.8.45-20150610
4PKGNAME= openjdk8-1.8.45 4PKGNAME= openjdk8-1.8.45
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openjdk.java.net/ 11HOMEPAGE= http://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 12COMMENT= Open-source implementation of the Java Platform, Standard Edition
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15DISTFILES= ${DEFAULT_DISTFILES} 15DISTFILES= ${DEFAULT_DISTFILES}
16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
17 17
18# Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles 18# Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles
19DIST_SUBDIR= openjdk7 19DIST_SUBDIR= openjdk7
20 20
21JAVA_NAME= openjdk8 21JAVA_NAME= openjdk8
22JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 22JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
23JAVA_WRAPPERS= jar java javac javadoc javah javap jps keytool orbd \ 23JAVA_WRAPPERS= jar java javac javadoc javah javap jps keytool orbd \
24 policytool rmid rmiregistry servertool tnameserv 24 policytool rmid rmiregistry servertool tnameserv
25 25
26BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts 26BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
27 27
28GNU_CONFIGURE= yes 28HAS_CONFIGURE= yes
29CONFIGURE_SCRIPT= common/autoconf/configure 29CONFIGURE_SCRIPT= common/autoconf/configure
30CONFIG_SHELL= bash 30CONFIG_SHELL= bash
31CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub 31CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub
32CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess 32CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess
33CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess 33CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess
34USE_LANGUAGES= c c++ 34USE_LANGUAGES= c c++
35USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run 35USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run
36UNLIMIT_RESOURCES= datasize stacksize 36UNLIMIT_RESOURCES= datasize stacksize
37WRKSRC= ${WRKDIR}/openjdk 37WRKSRC= ${WRKDIR}/openjdk
38PLIST_SRC+= ${PLIST_SRC_DFLT} 38PLIST_SRC+= ${PLIST_SRC_DFLT}
39 39
40BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR} 40BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
41PREPEND_PATH+= ${ALT_BOOTDIR}/bin 41PREPEND_PATH+= ${ALT_BOOTDIR}/bin
42 42
 43CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
 44CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q}
 45CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
43CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR} 46CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR}
44CONFIGURE_ARGS+= --with-zlib=system 47CONFIGURE_ARGS+= --with-zlib=system
45CONFIGURE_ARGS+= --with-giflib=bundled 48CONFIGURE_ARGS+= --with-giflib=bundled
46CONFIGURE_ARGS+= --with-cups=${BUILDLINK_PREFIX.cups} 49CONFIGURE_ARGS+= --with-cups=${BUILDLINK_PREFIX.cups}
47CONFIGURE_ARGS+= --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib 50CONFIGURE_ARGS+= --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib
48CONFIGURE_ARGS+= --with-freetype-include=${BUILDLINK_PREFIX.freetype2}/include 51CONFIGURE_ARGS+= --with-freetype-include=${BUILDLINK_PREFIX.freetype2}/include
49CONFIGURE_ARGS+= --disable-freetype-bundling 52CONFIGURE_ARGS+= --disable-freetype-bundling
50CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS:U1} 53CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS:U1}
51CONFIGURE_ARGS+= --with-num-cores=${MAKE_JOBS:U1} 54CONFIGURE_ARGS+= --with-num-cores=${MAKE_JOBS:U1}
52CONFIGURE_ARGS+= --with-memory-size=768 55CONFIGURE_ARGS+= --with-memory-size=768
53CONFIGURE_ARGS+= --disable-precompiled-headers 56CONFIGURE_ARGS+= --disable-precompiled-headers
54CONFIGURE_ARGS+= --disable-ccache 57CONFIGURE_ARGS+= --disable-ccache
55CONFIGURE_ARGS+= --with-user-release-suffix=pkgsrc_${PKGVERSION} 58CONFIGURE_ARGS+= --with-user-release-suffix=pkgsrc_${PKGVERSION}
@@ -78,52 +81,26 @@ PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS: @@ -78,52 +81,26 @@ PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS:
78SUBST_CLASSES+= libpath 81SUBST_CLASSES+= libpath
79SUBST_STAGE.libpath= pre-build 82SUBST_STAGE.libpath= pre-build
80SUBST_FILES.libpath+= hotspot/src/os/bsd/vm/os_bsd.cpp 83SUBST_FILES.libpath+= hotspot/src/os/bsd/vm/os_bsd.cpp
81SUBST_VARS.libpath= PREFIX 84SUBST_VARS.libpath= PREFIX
82 85
83CFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS 86CFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
84CXXFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS 87CXXFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
85 88
86.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc) 89.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
87MAKE_ENV+= USE_GCC=1 90MAKE_ENV+= USE_GCC=1
88MAKE_ENV+= ARCH_DATA_MODEL=${ABI:Q} 91MAKE_ENV+= ARCH_DATA_MODEL=${ABI:Q}
89.endif 92.endif
90 93
91# SmartOS has ccs tools in /usr/bin 
92.if ${OS_VARIANT} == "SmartOS" 
93SUBST_CLASSES+= ccspath 
94SUBST_STAGE.ccspath= pre-build 
95SUBST_FILES.ccspath= jdk/make/common/shared/Defs-utils.gmk 
96SUBST_FILES.ccspath+= hotspot/make/solaris/makefiles/build_vm_def.sh 
97SUBST_SED.ccspath= -e 's/UNIXCCS_PATH/UNIXCOMMAND_PATH/g' 
98SUBST_SED.ccspath+= -e 's,/usr/ccs/bin,/usr/bin,g' 
99.endif 
100 
101.if ${OPSYS} == "SunOS" 
102SUBST_CLASSES+= mapfix 
103SUBST_STAGE.mapfix= pre-build 
104SUBST_FILES.mapfix= jdk/make/com/sun/java/pack/mapfile-vers 
105SUBST_FILES.mapfix+= jdk/make/java/main/java/mapfile-amd64 
106SUBST_FILES.mapfix+= jdk/make/java/main/java/mapfile-i586 
107SUBST_SED.mapfix= -e '/__fsr_init_value/d' 
108SUBST_SED.mapfix+= -e '/__progname/d' 
109 
110# environ should only be removed from this file (added by patches) 
111SUBST_CLASSES+= mapfix2 
112SUBST_STAGE.mapfix2= pre-build 
113SUBST_FILES.mapfix2= jdk/make/com/sun/java/pack/mapfile-vers 
114SUBST_SED.mapfix2= -e '/environ/d' 
115.endif 
116 
117.if !empty(PKGSRC_COMPILER:Mclang) 94.if !empty(PKGSRC_COMPILER:Mclang)
118_WRAP_EXTRA_ARGS.CC+= -Wno-return-type 95_WRAP_EXTRA_ARGS.CC+= -Wno-return-type
119CWRAPPERS_APPEND.cc+= -Wno-return-type 96CWRAPPERS_APPEND.cc+= -Wno-return-type
120_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \ 97_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \
121 -Wno-shorten-64-to-32 -Wno-conversion \ 98 -Wno-shorten-64-to-32 -Wno-conversion \
122 -Wno-unused-value -Wno-switch-enum -Wno-switch \ 99 -Wno-unused-value -Wno-switch-enum -Wno-switch \
123 -Wno-tautological-compare \ 100 -Wno-tautological-compare \
124 -Wno-delete-non-virtual-dtor \ 101 -Wno-delete-non-virtual-dtor \
125 -Wno-return-type -Wno-unused-parameter \ 102 -Wno-return-type -Wno-unused-parameter \
126 -Wno-parentheses-equality -Wno-empty-body \ 103 -Wno-parentheses-equality -Wno-empty-body \
127 -Wno-format -Wno-dynamic-class-memaccess 104 -Wno-format -Wno-dynamic-class-memaccess
128CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \ 105CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \
129 -Wno-shorten-64-to-32 -Wno-conversion \ 106 -Wno-shorten-64-to-32 -Wno-conversion \
@@ -229,27 +206,26 @@ do-install: @@ -229,27 +206,26 @@ do-install:
229 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts 206 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts
230 rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h 207 rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h
231 ln -s ${LOWER_OPSYS:S/sunos/solaris/}/jni_md.h \ 208 ln -s ${LOWER_OPSYS:S/sunos/solaris/}/jni_md.h \
232 ${DESTDIR}${JAVA_HOME}/include/jni_md.h 209 ${DESTDIR}${JAVA_HOME}/include/jni_md.h
233 210
234.if ${OPSYS} == "NetBSD" 211.if ${OPSYS} == "NetBSD"
235TOOLS_PLATFORM.unzip= 212TOOLS_PLATFORM.unzip=
236.endif 213.endif
237 214
238# Include binutils for objcopy and GNU strip on SmartOS 215# Include binutils for objcopy and GNU strip on SmartOS
239.if ${OS_VARIANT} == "SmartOS" 216.if ${OS_VARIANT} == "SmartOS"
240.include "../../devel/binutils/buildlink3.mk" 217.include "../../devel/binutils/buildlink3.mk"
241BUILDLINK_DEPMETHOD.binutils?= build 218BUILDLINK_DEPMETHOD.binutils?= build
242MAKE_ENV+= ALT_OBJCOPY=${PREFIX}/bin/gobjcopy 
243MAKE_ENV+= STRIP=${PREFIX}/bin/gstrip 219MAKE_ENV+= STRIP=${PREFIX}/bin/gstrip
244.endif 220.endif
245 221
246# disabled the ALSA support for now on BSDs via patch 222# disabled the ALSA support for now on BSDs via patch
247#.include "../../audio/alsa-lib/buildlink3.mk" 223#.include "../../audio/alsa-lib/buildlink3.mk"
248.include "../../converters/libiconv/buildlink3.mk" 224.include "../../converters/libiconv/buildlink3.mk"
249.include "../../devel/zlib/buildlink3.mk" 225.include "../../devel/zlib/buildlink3.mk"
250.include "../../fonts/fontconfig/buildlink3.mk" 226.include "../../fonts/fontconfig/buildlink3.mk"
251.include "../../graphics/freetype2/buildlink3.mk" 227.include "../../graphics/freetype2/buildlink3.mk"
252BUILDLINK_DEPMETHOD.cups?= build 228BUILDLINK_DEPMETHOD.cups?= build
253.include "../../print/cups/buildlink3.mk" 229.include "../../print/cups/buildlink3.mk"
254.include "../../mk/java-env.mk" 230.include "../../mk/java-env.mk"
255.include "../../mk/bsd.pkg.mk" 231.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/lang/openjdk8/bootstrap.mk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/bootstrap.mk 2015/07/03 20:40:59 1.7
+++ pkgsrc/lang/openjdk8/bootstrap.mk 2015/07/05 21:03:05 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bootstrap.mk,v 1.7 2015/07/03 20:40:59 fhajny Exp $ 1# $NetBSD: bootstrap.mk,v 1.8 2015/07/05 21:03:05 fhajny Exp $
2# 2#
3# This file contains a map of available binary bootstrap toolchains 3# This file contains a map of available binary bootstrap toolchains
4# and which kit to use for each supported platform. 4# and which kit to use for each supported platform.
5# 5#
6# Instructions for regenerating a bootstrap kit: 6# Instructions for regenerating a bootstrap kit:
7# 1) Prepare a new chroot environment in which to build the kit 7# 1) Prepare a new chroot environment in which to build the kit
8# 2) If the running kernel version is not a release, use pkgtools/libkver 8# 2) If the running kernel version is not a release, use pkgtools/libkver
9# 3) Disable the x11 PKG_OPTION in openjdk7 9# 3) Disable the x11 PKG_OPTION in openjdk7
10# 4) "make" 10# 4) "make"
11# 5) cd $(make show-var VARNAME=BUILDDIR) 11# 5) cd $(make show-var VARNAME=BUILDDIR)
12# 6) mv j2sdk-image bootstrap 12# 6) mv j2sdk-image bootstrap
13# 7) cd bootstrap; rm -r demo man release sample src.zip 13# 7) cd bootstrap; rm -r demo man release sample src.zip
14# 8) When preparing kits for NetBSD 7 and above with gcc, copy libgcc_s.so.* 14# 8) When preparing kits for NetBSD 7 and above with gcc, copy libgcc_s.so.*
@@ -44,27 +44,26 @@ BOOT.dfly3.8-amd64= bootstrap-jdk7u60-bi @@ -44,27 +44,26 @@ BOOT.dfly3.8-amd64= bootstrap-jdk7u60-bi
44.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo) 44.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
45DISTFILES+= ${BOOT.nb5-i386} 45DISTFILES+= ${BOOT.nb5-i386}
46EXTRACT_ONLY+= ${BOOT.nb5-i386} 46EXTRACT_ONLY+= ${BOOT.nb5-i386}
47.endif 47.endif
48 48
49.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-x86_64) || make(distinfo) 49.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-x86_64) || make(distinfo)
50DISTFILES+= ${BOOT.nb5-amd64} 50DISTFILES+= ${BOOT.nb5-amd64}
51EXTRACT_ONLY+= ${BOOT.nb5-amd64} 51EXTRACT_ONLY+= ${BOOT.nb5-amd64}
52.endif 52.endif
53 53
54.if ${OPSYS} == "SunOS" 54.if ${OPSYS} == "SunOS"
55BUILD_DEPENDS+= sun-jdk7-[0-9]*:../../lang/sun-jdk7 55BUILD_DEPENDS+= sun-jdk7-[0-9]*:../../lang/sun-jdk7
56JDK_BOOTDIR= ${PREFIX}/java/sun-7 56JDK_BOOTDIR= ${PREFIX}/java/sun-7
57MAKE_ENV+= ALT_JDK_IMPORT_PATH=${JDK_BOOTDIR} 
58.endif 57.endif
59 58
60.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-i386) || make(distinfo) 59.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-i386) || make(distinfo)
61DISTFILES+= ${BOOT.nb6-i386} 60DISTFILES+= ${BOOT.nb6-i386}
62EXTRACT_ONLY+= ${BOOT.nb6-i386} 61EXTRACT_ONLY+= ${BOOT.nb6-i386}
63.endif 62.endif
64 63
65.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-x86_64) || make(distinfo) 64.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-x86_64) || make(distinfo)
66DISTFILES+= ${BOOT.nb6-amd64} 65DISTFILES+= ${BOOT.nb6-amd64}
67EXTRACT_ONLY+= ${BOOT.nb6-amd64} 66EXTRACT_ONLY+= ${BOOT.nb6-amd64}
68.endif 67.endif
69 68
70.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-i386) || !empty(MACHINE_PLATFORM:MNetBSD-7.*-i386) || make(distinfo) 69.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-i386) || !empty(MACHINE_PLATFORM:MNetBSD-7.*-i386) || make(distinfo)