Thu Oct 15 08:47:32 2009 UTC ()
Make sure keytool is called with C locale so it understands "yes" on stdin.
Should fix build failure reported by Tobias Astrom.


(tnn)
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/Makefile 2009/10/14 13:44:26 1.2
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2009/10/15 08:47:32 1.3
@@ -1,143 +1,143 @@ @@ -1,143 +1,143 @@
1# $NetBSD: Makefile,v 1.2 2009/10/14 13:44:26 tnn Exp $ 1# $NetBSD: Makefile,v 1.3 2009/10/15 08:47:32 tnn Exp $
2 2
3DISTNAME= openjdk-7-ea-src-b72-17_sep_2009 3DISTNAME= openjdk-7-ea-src-b72-17_sep_2009
4PKGNAME= openjdk7-1.7.0.72.20090924 4PKGNAME= openjdk7-1.7.0.72.20090924
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 6MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= tnn@NetBSD.org 9MAINTAINER= tnn@NetBSD.org
10HOMEPAGE= http://openjdk.java.net/ 10HOMEPAGE= http://openjdk.java.net/
11COMMENT= Open-source implementation of the Java Platform, Standard Edition 11COMMENT= Open-source implementation of the Java Platform, Standard Edition
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15DISTFILES= ${DEFAULT_DISTFILES} 15DISTFILES= ${DEFAULT_DISTFILES}
16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
17 17
18# diff between distfile and bsd-port branch. To check out, use: 18# diff between distfile and bsd-port branch. To check out, use:
19# "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/" 19# "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/"
20PATCHFILES+= jdk-7-bsd-port-72.20090924.diff.bz2 20PATCHFILES+= jdk-7-bsd-port-72.20090924.diff.bz2
21PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} 21PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/}
22 22
23CACERTS= cacerts-20091013.tar.bz2 23CACERTS= cacerts-20091013.tar.bz2
24DISTFILES+= ${CACERTS} 24DISTFILES+= ${CACERTS}
25EXTRACT_ONLY+= ${CACERTS} 25EXTRACT_ONLY+= ${CACERTS}
26 26
27JAVA_NAME= openjdk7 27JAVA_NAME= openjdk7
28JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 28JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
29JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \ 29JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \
30 policytool rmid rmiregistry servertool tnameserv 30 policytool rmid rmiregistry servertool tnameserv
31 31
32BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip 32BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
33BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip 33BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
34MAKE_ENV+= PKGSRC_ZIPEXE=${PREFIX}/bin/zip 34MAKE_ENV+= PKGSRC_ZIPEXE=${PREFIX}/bin/zip
35MAKE_ENV+= PKGSRC_UNZIP=${PREFIX}/bin/unzip 35MAKE_ENV+= PKGSRC_UNZIP=${PREFIX}/bin/unzip
36MAKE_ENV+= PKGSRC_UNZIPSFX=${PREFIX}/bin/unzipsfv 36MAKE_ENV+= PKGSRC_UNZIPSFX=${PREFIX}/bin/unzipsfv
37 37
38NO_CONFIGURE= yes 38NO_CONFIGURE= yes
39USE_LANGUAGES= c c++ 39USE_LANGUAGES= c c++
40USE_TOOLS+= gmake pax 40USE_TOOLS+= gmake pax
41UNLIMIT_RESOURCES= datasize stacksize 41UNLIMIT_RESOURCES= datasize stacksize
42WRKSRC= ${WRKDIR}/openjdk 42WRKSRC= ${WRKDIR}/openjdk
43 43
44BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR} 44BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
45PREPEND_PATH+= ${ALT_BOOTDIR}/bin 45PREPEND_PATH+= ${ALT_BOOTDIR}/bin
46 46
47MAKE_ENV+= ALT_BOOTDIR=${ALT_BOOTDIR} 47MAKE_ENV+= ALT_BOOTDIR=${ALT_BOOTDIR}
48MAKE_ENV+= ALT_FREETYPE_LIB_PATH=${BUILDLINK_PREFIX.freetype2}/lib 48MAKE_ENV+= ALT_FREETYPE_LIB_PATH=${BUILDLINK_PREFIX.freetype2}/lib
49MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include 49MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include
50MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include 50MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include
51MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin 51MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin
52MAKE_ENV+= ALT_X11_PATH=${X11BASE} 52MAKE_ENV+= ALT_X11_PATH=${X11BASE}
53 53
54MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1} 54MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1}
55 55
56MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc 56MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc
57MAKE_ENV+= NO_DOCS=true 57MAKE_ENV+= NO_DOCS=true
58MAKE_ENV+= SKIP_COMPARE_IMAGES=true 58MAKE_ENV+= SKIP_COMPARE_IMAGES=true
59MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes 59MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes
60MAKE_ENV+= SKIP_DEBUG_BUILD=yes 60MAKE_ENV+= SKIP_DEBUG_BUILD=yes
61 61
62BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/} 62BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
63PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/} 63PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/}
64PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS} 64PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS}
65 65
66.include "../../mk/bsd.prefs.mk" 66.include "../../mk/bsd.prefs.mk"
67.include "bootstrap.mk" 67.include "bootstrap.mk"
68.include "icedtea-extras.mk" 68.include "icedtea-extras.mk"
69 69
70SUBST_CLASSES+= add-rpaths 70SUBST_CLASSES+= add-rpaths
71SUBST_STAGE.add-rpaths= pre-build 71SUBST_STAGE.add-rpaths= pre-build
72SUBST_MESSAGE.add-rpaths= adding X11 run path flags to Makefiles 72SUBST_MESSAGE.add-rpaths= adding X11 run path flags to Makefiles
73SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \ 73SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \
74 jdk/make/sun/awt/mawt.gmk \ 74 jdk/make/sun/awt/mawt.gmk \
75 jdk/make/sun/jawt/Makefile \ 75 jdk/make/sun/jawt/Makefile \
76 jdk/make/sun/jdga/Makefile \ 76 jdk/make/sun/jdga/Makefile \
77 jdk/make/sun/splashscreen/Makefile \ 77 jdk/make/sun/splashscreen/Makefile \
78 jdk/make/sun/xawt/Makefile 78 jdk/make/sun/xawt/Makefile
79SUBST_SED.add-rpaths= -e 's|-L$$(OPENWIN_LIB)|-L$$(OPENWIN_LIB) -Wl,-R$$(OPENWIN_LIB)|g' 79SUBST_SED.add-rpaths= -e 's|-L$$(OPENWIN_LIB)|-L$$(OPENWIN_LIB) -Wl,-R$$(OPENWIN_LIB)|g'
80 80
81PLIST_VARS+= i386 81PLIST_VARS+= i386
82.if ${MACHINE_ARCH} == "i386" 82.if ${MACHINE_ARCH} == "i386"
83PLIST.i386= yes 83PLIST.i386= yes
84.endif 84.endif
85 85
86post-extract: 86post-extract:
87 chmod +x ${ANT_BIN}/ant 87 chmod +x ${ANT_BIN}/ant
88 cd ${WRKDIR}/${ICEDTEA}/plugin/icedteanp/java && pax -rw . \ 88 cd ${WRKDIR}/${ICEDTEA}/plugin/icedteanp/java && pax -rw . \
89 ${WRKSRC}/jdk/src/share/classes 89 ${WRKSRC}/jdk/src/share/classes
90 cd ${WRKDIR}/${ICEDTEA}/netx && pax -rw . \ 90 cd ${WRKDIR}/${ICEDTEA}/netx && pax -rw . \
91 ${WRKSRC}/jdk/src/share/classes 91 ${WRKSRC}/jdk/src/share/classes
92 92
93do-build: ${WRKDIR}/stage3-done 93do-build: ${WRKDIR}/stage3-done
94 94
95# stage 1 builds a native JDK using the bootstrap binaries 95# stage 1 builds a native JDK using the bootstrap binaries
96${WRKDIR}/stage1-done: 96${WRKDIR}/stage1-done:
97 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 97 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
98 rm -rf ${WRKDIR}/bootstrap 98 rm -rf ${WRKDIR}/bootstrap
99 cd ${BUILDDIR} && mv j2sdk-image ${WRKDIR}/bootstrap 99 cd ${BUILDDIR} && mv j2sdk-image ${WRKDIR}/bootstrap
100 rm -rf ${BUILDDIR} 100 rm -rf ${BUILDDIR}
101 touch ${WRKDIR}/stage1-done 101 touch ${WRKDIR}/stage1-done
102 102
103# stage 2 rebuilds the JDK using native tools 103# stage 2 rebuilds the JDK using native tools
104${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done 104${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done
105 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 105 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
106 touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep 106 touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep
107 touch ${WRKDIR}/stage2-done 107 touch ${WRKDIR}/stage2-done
108 108
109# stage 3 builds third party add-ons 109# stage 3 builds third party add-ons
110${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out 110${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out
111 touch ${WRKDIR}/stage3-done 111 touch ${WRKDIR}/stage3-done
112 112
113${WRKDIR}/cacerts.out: 113${WRKDIR}/cacerts.out:
114 for cert in ${WRKDIR}/cacerts/*.crt; do \ 114 for cert in ${WRKDIR}/cacerts/*.crt; do \
115 ${ECHO} yes | ${BUILDDIR}/bin/keytool \ 115 ${ECHO} yes | LC_ALL=C ${BUILDDIR}/bin/keytool \
116 -importcert \ 116 -importcert \
117 -keystore ${.TARGET} \ 117 -keystore ${.TARGET} \
118 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.crt,\\1,'` \ 118 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.crt,\\1,'` \
119 -file $$cert \ 119 -file $$cert \
120 -storepass pkgsrc; \ 120 -storepass pkgsrc; \
121 done 121 done
122 122
123do-install: 123do-install:
124 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} 124 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
125 cd ${BUILDDIR}/j2sdk-image && pax -rwpp . \ 125 cd ${BUILDDIR}/j2sdk-image && pax -rwpp . \
126 ${DESTDIR}${JAVA_HOME}/. 126 ${DESTDIR}${JAVA_HOME}/.
127 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \ 127 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \
128 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts 128 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts
129 129
130.include "../../graphics/freetype2/buildlink3.mk" 130.include "../../graphics/freetype2/buildlink3.mk"
131BUILDLINK_DEPMETHOD.cups?= build 131BUILDLINK_DEPMETHOD.cups?= build
132.include "../../print/cups/buildlink3.mk" 132.include "../../print/cups/buildlink3.mk"
133.include "../../x11/libXext/buildlink3.mk" 133.include "../../x11/libXext/buildlink3.mk"
134.include "../../x11/libXi/buildlink3.mk" 134.include "../../x11/libXi/buildlink3.mk"
135BUILDLINK_DEPMETHOD.libXp?= build 135BUILDLINK_DEPMETHOD.libXp?= build
136.include "../../x11/libXp/buildlink3.mk" 136.include "../../x11/libXp/buildlink3.mk"
137BUILDLINK_DEPMETHOD.libXt?= build 137BUILDLINK_DEPMETHOD.libXt?= build
138.include "../../x11/libXt/buildlink3.mk" 138.include "../../x11/libXt/buildlink3.mk"
139.include "../../x11/libXtst/buildlink3.mk" 139.include "../../x11/libXtst/buildlink3.mk"
140.include "../../x11/libXrender/buildlink3.mk" 140.include "../../x11/libXrender/buildlink3.mk"
141.include "../../x11/xextproto/buildlink3.mk" 141.include "../../x11/xextproto/buildlink3.mk"
142.include "../../mk/java-env.mk" 142.include "../../mk/java-env.mk"
143.include "../../mk/bsd.pkg.mk" 143.include "../../mk/bsd.pkg.mk"