Tue Dec 12 12:37:45 2023 UTC (167d)
openjdk11: Fix build error

Reported by abs@.


(ryoon)
diff -r1.60 -r1.61 pkgsrc/lang/openjdk11/Makefile
diff -r1.8 -r1.9 pkgsrc/lang/openjdk11/bootstrap.mk
cvs diff -r1.60 -r1.61 pkgsrc/lang/openjdk11/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/Makefile 2023/12/09 01:19:54 1.60
+++ pkgsrc/lang/openjdk11/Makefile 2023/12/12 12:37:44 1.61
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.60 2023/12/09 01:19:54 ryoon Exp $ 1# $NetBSD: Makefile,v 1.61 2023/12/12 12:37:44 ryoon Exp $
2 2
3DISTNAME= jdk11u-${GITHUB_TAG:C/\+/-/} 3DISTNAME= jdk11u-${GITHUB_TAG:C/\+/-/}
4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} 4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
8GITHUB_PROJECT= jdk11u 8GITHUB_PROJECT= jdk11u
9GITHUB_TAG= jdk-11.0.21+9-1 9GITHUB_TAG= jdk-11.0.21+9-1
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://openjdk.java.net/ 12HOMEPAGE= https://openjdk.java.net/
13COMMENT= Open-source implementation of the Java Platform, Standard Edition 13COMMENT= Open-source implementation of the Java Platform, Standard Edition
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
@@ -169,27 +169,27 @@ ${WRKDIR}/cacerts.out: @@ -169,27 +169,27 @@ ${WRKDIR}/cacerts.out:
169 ${ALT_BOOTDIR}/bin/keytool \ 169 ${ALT_BOOTDIR}/bin/keytool \
170 -noprompt \ 170 -noprompt \
171 -importcert \ 171 -importcert \
172 -keystore ${.TARGET}.tmp \ 172 -keystore ${.TARGET}.tmp \
173 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \ 173 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \
174 -file $$cert \ 174 -file $$cert \
175 -storetype jks \ 175 -storetype jks \
176 -storepass changeit; \ 176 -storepass changeit; \
177 done 177 done
178 mv ${.TARGET}.tmp ${.TARGET} 178 mv ${.TARGET}.tmp ${.TARGET}
179 179
180do-build: 180do-build:
181 rm -f ${WRKSRC}/make/data/fontconfig/*.orig 181 rm -f ${WRKSRC}/make/data/fontconfig/*.orig
182 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib ${MAKE_PROGRAM} 182 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib:${ALT_BOOTDIR}/lib/jli ${MAKE_PROGRAM}
183 183
184do-install: 184do-install:
185 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} 185 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
186 cd ${BUILDDIR}/images/jdk && pax -rwpp . \ 186 cd ${BUILDDIR}/images/jdk && pax -rwpp . \
187 ${DESTDIR}${JAVA_HOME}/. 187 ${DESTDIR}${JAVA_HOME}/.
188 188
189.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 189.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
190.include "../../audio/alsa-lib/buildlink3.mk" 190.include "../../audio/alsa-lib/buildlink3.mk"
191CONFIGURE_ARGS+= --with-alsa=${BUILDLINK_PREFIX.alsa-lib} 191CONFIGURE_ARGS+= --with-alsa=${BUILDLINK_PREFIX.alsa-lib}
192.endif 192.endif
193.include "../../converters/libiconv/buildlink3.mk" 193.include "../../converters/libiconv/buildlink3.mk"
194.include "../../devel/zlib/buildlink3.mk" 194.include "../../devel/zlib/buildlink3.mk"
195.include "../../fonts/fontconfig/buildlink3.mk" 195.include "../../fonts/fontconfig/buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/lang/openjdk11/bootstrap.mk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/bootstrap.mk 2022/05/25 20:00:56 1.8
+++ pkgsrc/lang/openjdk11/bootstrap.mk 2023/12/12 12:37:44 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bootstrap.mk,v 1.8 2022/05/25 20:00:56 tnn Exp $ 1# $NetBSD: bootstrap.mk,v 1.9 2023/12/12 12:37:44 ryoon Exp $
2 2
3.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000 3.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000
4PKG_FAIL_REASON+= "Only supports NetBSD >= 8" 4PKG_FAIL_REASON+= "Only supports NetBSD >= 8"
5.endif 5.endif
6 6
7.if (!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || !empty(MACHINE_PLATFORM:MNetBSD-*-*earm*)) && ${OPSYS_VERSION} < 099983 7.if (!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || !empty(MACHINE_PLATFORM:MNetBSD-*-*earm*)) && ${OPSYS_VERSION} < 099983
8PKG_FAIL_REASON+= "PR 55248: please update to NetBSD >= 9.99.83 to use this package" 8PKG_FAIL_REASON+= "PR 55248: please update to NetBSD >= 9.99.83 to use this package"
9.endif 9.endif
10 10
11ONLY_FOR_PLATFORM+= NetBSD-*-i386 11ONLY_FOR_PLATFORM+= NetBSD-*-i386
12BOOT.nb7-i386= bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz 12BOOT.nb7-i386= bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz
13SITES.${BOOT.nb7-i386}= ${MASTER_SITE_LOCAL:=openjdk11/} 13SITES.${BOOT.nb7-i386}= ${MASTER_SITE_LOCAL:=openjdk11/}
14.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) 14.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo)
@@ -30,16 +30,16 @@ SITES.${BOOT.nb9-aarch64}= ${MASTER_SITE @@ -30,16 +30,16 @@ SITES.${BOOT.nb9-aarch64}= ${MASTER_SITE
30.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) 30.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo)
31DISTFILES+= ${BOOT.nb9-aarch64} 31DISTFILES+= ${BOOT.nb9-aarch64}
32EXTRACT_ONLY+= ${BOOT.nb9-aarch64} 32EXTRACT_ONLY+= ${BOOT.nb9-aarch64}
33.endif 33.endif
34 34
35ONLY_FOR_PLATFORM+= NetBSD-*-earmv[67]hf 35ONLY_FOR_PLATFORM+= NetBSD-*-earmv[67]hf
36BOOT.nb8-earmv6hf= bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz 36BOOT.nb8-earmv6hf= bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz
37SITES.${BOOT.nb8-earmv6hf}= ${MASTER_SITE_LOCAL:=openjdk11/} 37SITES.${BOOT.nb8-earmv6hf}= ${MASTER_SITE_LOCAL:=openjdk11/}
38.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || make(distinfo) 38.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || make(distinfo)
39DISTFILES+= ${BOOT.nb8-earmv6hf} 39DISTFILES+= ${BOOT.nb8-earmv6hf}
40EXTRACT_ONLY+= ${BOOT.nb8-earmv6hf} 40EXTRACT_ONLY+= ${BOOT.nb8-earmv6hf}
41.endif 41.endif
42 42
43CONFIGURE_ENV+= LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib 43CONFIGURE_ENV+= LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib:${ALT_BOOTDIR}/lib/jli
44 44
45ALT_BOOTDIR= ${WRKDIR}/bootstrap 45ALT_BOOTDIR= ${WRKDIR}/bootstrap