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 (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,255 +1,231 @@ @@ -1,255 +1,231 @@
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}
56CONFIGURE_ARGS+= --with-update-version=u${PKGVERSION_NOREV:S/1.8.//} 59CONFIGURE_ARGS+= --with-update-version=u${PKGVERSION_NOREV:S/1.8.//}
57 60
58CHECK_PORTABILITY_SKIP+= hotspot/test/runtime/*/*.sh 61CHECK_PORTABILITY_SKIP+= hotspot/test/runtime/*/*.sh
59 62
60# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user. 63# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
61MAKE_ENV+= JAVA_HOME= 64MAKE_ENV+= JAVA_HOME=
62MAKE_ENV+= CLASSPATH= 65MAKE_ENV+= CLASSPATH=
63 66
64BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/} 67BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}
65BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} 68BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
66LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} 69LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
67BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL} 70BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
68LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server 71LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server
69CONFIGURE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 72CONFIGURE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
70MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 73MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
71BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk8/jre/lib/${LIBDIR_ARCH} 74BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk8/jre/lib/${LIBDIR_ARCH}
72 75
73PLIST_SUBST+= ARCH=${LIBDIR_ARCH} 76PLIST_SUBST+= ARCH=${LIBDIR_ARCH}
74PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS:S/sunos/solaris/} 77PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS:S/sunos/solaris/}
75 78
76.include "../../mk/compiler.mk" 79.include "../../mk/compiler.mk"
77 80
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 \
130 -Wno-unused-value -Wno-switch-enum -Wno-switch \ 107 -Wno-unused-value -Wno-switch-enum -Wno-switch \
131 -Wno-tautological-compare \ 108 -Wno-tautological-compare \
132 -Wno-delete-non-virtual-dtor \ 109 -Wno-delete-non-virtual-dtor \
133 -Wno-return-type -Wno-unused-parameter \ 110 -Wno-return-type -Wno-unused-parameter \
134 -Wno-parentheses-equality -Wno-empty-body \ 111 -Wno-parentheses-equality -Wno-empty-body \
135 -Wno-format -Wno-dynamic-class-memaccess 112 -Wno-format -Wno-dynamic-class-memaccess
136. if ${OPSYS} != "FreeBSD" 113. if ${OPSYS} != "FreeBSD"
137_WRAP_EXTRA_ARGS.CXX+= -Wno-new-returns-null 114_WRAP_EXTRA_ARGS.CXX+= -Wno-new-returns-null
138CWRAPPERS_APPEND.cxx+= -Wno-new-returns-null 115CWRAPPERS_APPEND.cxx+= -Wno-new-returns-null
139. endif 116. endif
140BUILDLINK_TRANSFORM+= rm:-fcheck-new 117BUILDLINK_TRANSFORM+= rm:-fcheck-new
141BUILDLINK_TRANSFORM+= rm:-fpch-deps 118BUILDLINK_TRANSFORM+= rm:-fpch-deps
142. if ${MACHINE_ARCH} == "x86_64" 119. if ${MACHINE_ARCH} == "x86_64"
143_WRAP_EXTRA_ARGS.CXX+= -mstackrealign 120_WRAP_EXTRA_ARGS.CXX+= -mstackrealign
144CWRAPPERS_APPEND.cxx+= -mstackrealign 121CWRAPPERS_APPEND.cxx+= -mstackrealign
145. endif 122. endif
146.endif 123.endif
147.include "bootstrap.mk" 124.include "bootstrap.mk"
148 125
149.include "options.mk" 126.include "options.mk"
150 127
151SUBST_CLASSES+= fontpaths 128SUBST_CLASSES+= fontpaths
152SUBST_STAGE.fontpaths= pre-build 129SUBST_STAGE.fontpaths= pre-build
153SUBST_MESSAGE.fontpaths= fixing font paths 130SUBST_MESSAGE.fontpaths= fixing font paths
154SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties 131SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
155SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c 132SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c
156SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g' 133SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g'
157SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g' 134SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
158 135
159PLIST_VARS+= i386 136PLIST_VARS+= i386
160.if ${MACHINE_ARCH} == "i386" 137.if ${MACHINE_ARCH} == "i386"
161PLIST.i386= yes 138PLIST.i386= yes
162.endif 139.endif
163 140
164PLIST_VARS+= sctp 141PLIST_VARS+= sctp
165.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" 142.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
166PLIST.sctp= yes 143PLIST.sctp= yes
167.endif 144.endif
168 145
169post-extract: 146post-extract:
170# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with 147# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with
171# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base. 148# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base.
172.if exists(/lib/libgcc_s.so.1) 149.if exists(/lib/libgcc_s.so.1)
173 ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libgcc_s.so* 150 ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libgcc_s.so*
174.endif 151.endif
175.if exists(/usr/lib/libstdc++.so.7) 152.if exists(/usr/lib/libstdc++.so.7)
176 ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so* 153 ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so*
177.endif 154.endif
178 155
179do-build: ${WRKDIR}/stage3-done 156do-build: ${WRKDIR}/stage3-done
180 157
181# stage 1 builds a native JDK using the bootstrap binaries 158# stage 1 builds a native JDK using the bootstrap binaries
182${WRKDIR}/stage1-done: 159${WRKDIR}/stage1-done:
183 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} images 160 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} images
184 rm -rf ${ALT_BOOTDIR} 161 rm -rf ${ALT_BOOTDIR}
185 cd ${BUILDDIR}/images && mv j2sdk-image ${ALT_BOOTDIR} 162 cd ${BUILDDIR}/images && mv j2sdk-image ${ALT_BOOTDIR}
186.for d in corba hotspot jaxp jaxws langtools tmp 163.for d in corba hotspot jaxp jaxws langtools tmp
187 mv ${BUILDDIR}/${d} ${BUILDDIR}/${d}-stage1 164 mv ${BUILDDIR}/${d} ${BUILDDIR}/${d}-stage1
188.endfor 165.endfor
189 touch ${.TARGET} 166 touch ${.TARGET}
190 167
191# stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now 168# stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now
192${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done 169${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done
193.if defined(BATCH) 170.if defined(BATCH)
194 @${RECURSIVE_MAKE} ${MAKEFLAGS} apply-va-hack 171 @${RECURSIVE_MAKE} ${MAKEFLAGS} apply-va-hack
195.endif 172.endif
196 @${STEP_MSG} "Reconfiguring with newly built JDK" 173 @${STEP_MSG} "Reconfiguring with newly built JDK"
197 @${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure 174 @${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure
198 touch ${.TARGET} 175 touch ${.TARGET}
199 176
200# stage 2 rebuilds the JDK using native tools 177# stage 2 rebuilds the JDK using native tools
201${WRKDIR}/stage2-done: ${WRKDIR}/stage1_5-done 178${WRKDIR}/stage2-done: ${WRKDIR}/stage1_5-done
202 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} images 179 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} images
203 touch ${.TARGET} 180 touch ${.TARGET}
204 181
205# stage 3 builds third party add-ons 182# stage 3 builds third party add-ons
206${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out 183${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out
207 touch ${.TARGET} 184 touch ${.TARGET}
208 185
209${WRKDIR}/cacerts.out: 186${WRKDIR}/cacerts.out:
210 mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \ 187 mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \
211 ${PREFIX}/sbin/mozilla-rootcerts extract 188 ${PREFIX}/sbin/mozilla-rootcerts extract
212 for cert in ${WRKDIR}/cacerts/*.pem; do \ 189 for cert in ${WRKDIR}/cacerts/*.pem; do \
213 ${INFO_MSG} "Importing $$cert" && \ 190 ${INFO_MSG} "Importing $$cert" && \
214 ${SETENV} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} LC_ALL=C \ 191 ${SETENV} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} LC_ALL=C \
215 ${ALT_BOOTDIR}/bin/keytool \ 192 ${ALT_BOOTDIR}/bin/keytool \
216 -noprompt \ 193 -noprompt \
217 -importcert \ 194 -importcert \
218 -keystore ${.TARGET} \ 195 -keystore ${.TARGET} \
219 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \ 196 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \
220 -file $$cert \ 197 -file $$cert \
221 -storepass changeit; \ 198 -storepass changeit; \
222 done 199 done
223 200
224do-install: 201do-install:
225 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} 202 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
226 cd ${BUILDDIR}/images/j2sdk-image && pax -rwpp . \ 203 cd ${BUILDDIR}/images/j2sdk-image && pax -rwpp . \
227 ${DESTDIR}${JAVA_HOME}/. 204 ${DESTDIR}${JAVA_HOME}/.
228 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \ 205 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \
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 (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,116 +1,115 @@ @@ -1,116 +1,115 @@
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.*
15# and libstdc++.so.* from base to bootstrap/jre/lib/${LIBDIR_ARCH}. 15# and libstdc++.so.* from base to bootstrap/jre/lib/${LIBDIR_ARCH}.
16# This will ensure that MKLLVM=yes/MKGCC=no user in the future can run 16# This will ensure that MKLLVM=yes/MKGCC=no user in the future can run
17# the bootstrap toolchain. For targets that use jdk-zero-vm you need 17# the bootstrap toolchain. For targets that use jdk-zero-vm you need
18# to include libffi.so.* as well. 18# to include libffi.so.* as well.
19# 9) tar cf - bootstrap | xz -9c > bootstrap-xxx.tar.xz 19# 9) tar cf - bootstrap | xz -9c > bootstrap-xxx.tar.xz
20# 10) gpg2 -a --detach-sign bootstrap-xxx.tar.xz 20# 10) gpg2 -a --detach-sign bootstrap-xxx.tar.xz
21# 11) Upload archive and signature to ${MASTER_SITE_LOCAL:=openjdk7/} 21# 11) Upload archive and signature to ${MASTER_SITE_LOCAL:=openjdk7/}
22# 22#
23# All binary kits from now on MUST have an accompanying PGP signature from 23# All binary kits from now on MUST have an accompanying PGP signature from
24# the person who prepared the kit. Unsigned binaries on ftp will be purged. 24# the person who prepared the kit. Unsigned binaries on ftp will be purged.
25 25
26ONLY_FOR_PLATFORM= NetBSD-[567].*-i386 NetBSD-[567].*-x86_64 26ONLY_FOR_PLATFORM= NetBSD-[567].*-i386 NetBSD-[567].*-x86_64
27ONLY_FOR_PLATFORM+= NetBSD-7.*-sparc64 NetBSD-7.*-earmv[67]hf 27ONLY_FOR_PLATFORM+= NetBSD-7.*-sparc64 NetBSD-7.*-earmv[67]hf
28ONLY_FOR_PLATFORM+= DragonFly-[34].*-* SunOS-*-* FreeBSD-10.*-x86_64 28ONLY_FOR_PLATFORM+= DragonFly-[34].*-* SunOS-*-* FreeBSD-10.*-x86_64
29 29
30BOOT.nb5-i386= bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz 30BOOT.nb5-i386= bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz
31BOOT.nb5-amd64= bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz 31BOOT.nb5-amd64= bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz
32BOOT.nb6-i386= bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz 32BOOT.nb6-i386= bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz
33BOOT.nb6-amd64= bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz 33BOOT.nb6-amd64= bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz
34BOOT.nb7-i386= bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz 34BOOT.nb7-i386= bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz
35BOOT.nb7-amd64= bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz 35BOOT.nb7-amd64= bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz
36BOOT.nb7-sparc64= bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz 36BOOT.nb7-sparc64= bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz
37BOOT.nb7-earmv6hf= bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz 37BOOT.nb7-earmv6hf= bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz
38BOOT.fbsd10-amd64= bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz 38BOOT.fbsd10-amd64= bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz
39 39
40#XXX should be regenerated 40#XXX should be regenerated
41BOOT.dfly3.6-amd64= bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2 41BOOT.dfly3.6-amd64= bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2
42BOOT.dfly3.8-amd64= bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2 42BOOT.dfly3.8-amd64= bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2
43 43
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)
71DISTFILES+= ${BOOT.nb7-i386} 70DISTFILES+= ${BOOT.nb7-i386}
72EXTRACT_ONLY+= ${BOOT.nb7-i386} 71EXTRACT_ONLY+= ${BOOT.nb7-i386}
73.endif 72.endif
74 73
75.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-7.*-x86_64) || make(distinfo) 74.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-7.*-x86_64) || make(distinfo)
76DISTFILES+= ${BOOT.nb7-amd64} 75DISTFILES+= ${BOOT.nb7-amd64}
77EXTRACT_ONLY+= ${BOOT.nb7-amd64} 76EXTRACT_ONLY+= ${BOOT.nb7-amd64}
78.endif 77.endif
79 78
80.if !empty(MACHINE_PLATFORM:MNetBSD-7.*-sparc64) || make(distinfo) 79.if !empty(MACHINE_PLATFORM:MNetBSD-7.*-sparc64) || make(distinfo)
81DISTFILES+= ${BOOT.nb7-sparc64} 80DISTFILES+= ${BOOT.nb7-sparc64}
82EXTRACT_ONLY+= ${BOOT.nb7-sparc64} 81EXTRACT_ONLY+= ${BOOT.nb7-sparc64}
83.endif 82.endif
84 83
85.if !empty(MACHINE_PLATFORM:MNetBSD-7.*-earmv[67]hf) || make(distinfo) 84.if !empty(MACHINE_PLATFORM:MNetBSD-7.*-earmv[67]hf) || make(distinfo)
86DISTFILES+= ${BOOT.nb7-earmv6hf} 85DISTFILES+= ${BOOT.nb7-earmv6hf}
87EXTRACT_ONLY+= ${BOOT.nb7-earmv6hf} 86EXTRACT_ONLY+= ${BOOT.nb7-earmv6hf}
88.endif 87.endif
89 88
90.if !empty(MACHINE_PLATFORM:MDragonFly-3.6*-x86_64) || make(distinfo) 89.if !empty(MACHINE_PLATFORM:MDragonFly-3.6*-x86_64) || make(distinfo)
91DISTFILES+= ${BOOT.dfly3.6-amd64} 90DISTFILES+= ${BOOT.dfly3.6-amd64}
92EXTRACT_ONLY+= ${BOOT.dfly3.6-amd64} 91EXTRACT_ONLY+= ${BOOT.dfly3.6-amd64}
93.endif 92.endif
94 93
95.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || !empty(MACHINE_PLATFORM:MDragonFly-4.*-x86_64) || make(distinfo) 94.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || !empty(MACHINE_PLATFORM:MDragonFly-4.*-x86_64) || make(distinfo)
96DISTFILES+= ${BOOT.dfly3.8-amd64} 95DISTFILES+= ${BOOT.dfly3.8-amd64}
97EXTRACT_ONLY+= ${BOOT.dfly3.8-amd64} 96EXTRACT_ONLY+= ${BOOT.dfly3.8-amd64}
98.endif 97.endif
99 98
100.if !empty(MACHINE_PLATFORM:MFreeBSD-10.*-x86_64) || make(distinfo) 99.if !empty(MACHINE_PLATFORM:MFreeBSD-10.*-x86_64) || make(distinfo)
101DISTFILES+= ${BOOT.fbsd10-amd64} 100DISTFILES+= ${BOOT.fbsd10-amd64}
102EXTRACT_ONLY+= ${BOOT.fbsd10-amd64} 101EXTRACT_ONLY+= ${BOOT.fbsd10-amd64}
103.endif 102.endif
104 103
105.if ${OPSYS} == "SunOS" 104.if ${OPSYS} == "SunOS"
106BUILDLINK_DEPMETHOD.sun-jdk7?= build 105BUILDLINK_DEPMETHOD.sun-jdk7?= build
107.include "../../lang/sun-jdk7/buildlink3.mk" 106.include "../../lang/sun-jdk7/buildlink3.mk"
108#NB: sun-jdk7 includes sun-jre7/buildlink3.mk 107#NB: sun-jdk7 includes sun-jre7/buildlink3.mk
109post-extract: copy-bootstrap-jdk 108post-extract: copy-bootstrap-jdk
110.PHONY: copy-bootstrap-jdk 109.PHONY: copy-bootstrap-jdk
111copy-bootstrap-jdk: 110copy-bootstrap-jdk:
112 ${MKDIR} ${ALT_BOOTDIR} 111 ${MKDIR} ${ALT_BOOTDIR}
113 cd ${BUILDLINK_JAVA_PREFIX.sun-jre7:tA} && pax -rw . ${ALT_BOOTDIR} 112 cd ${BUILDLINK_JAVA_PREFIX.sun-jre7:tA} && pax -rw . ${ALT_BOOTDIR}
114.endif 113.endif
115 114
116ALT_BOOTDIR= ${WRKDIR}/bootstrap 115ALT_BOOTDIR= ${WRKDIR}/bootstrap