CVS commit: pkgsrc/lang/openjdk11

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Dec 12 12:37:45 UTC 2023

Modified Files:
        pkgsrc/lang/openjdk11: Makefile bootstrap.mk

Log Message:
openjdk11: Fix build error

Reported by abs@.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/openjdk11/bootstrap.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.60 pkgsrc/lang/openjdk11/Makefile:1.61
--- pkgsrc/lang/openjdk11/Makefile:1.60 Sat Dec  9 01:19:54 2023
+++ pkgsrc/lang/openjdk11/Makefile      Tue Dec 12 12:37:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2023/12/09 01:19:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.61 2023/12/12 12:37:44 ryoon Exp $
 
 DISTNAME=      jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -179,7 +179,7 @@ ${WRKDIR}/cacerts.out:
 
 do-build:
        rm -f ${WRKSRC}/make/data/fontconfig/*.orig
-       ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib ${MAKE_PROGRAM}
+       ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib:${ALT_BOOTDIR}/lib/jli ${MAKE_PROGRAM}
 
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}

Index: pkgsrc/lang/openjdk11/bootstrap.mk
diff -u pkgsrc/lang/openjdk11/bootstrap.mk:1.8 pkgsrc/lang/openjdk11/bootstrap.mk:1.9
--- pkgsrc/lang/openjdk11/bootstrap.mk:1.8      Wed May 25 20:00:56 2022
+++ pkgsrc/lang/openjdk11/bootstrap.mk  Tue Dec 12 12:37:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.8 2022/05/25 20:00:56 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.9 2023/12/12 12:37:44 ryoon Exp $
 
 .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000
 PKG_FAIL_REASON+=              "Only supports NetBSD >= 8"
@@ -40,6 +40,6 @@ DISTFILES+=                   ${BOOT.nb8-earmv6hf}
 EXTRACT_ONLY+=                 ${BOOT.nb8-earmv6hf}
 .endif
 
-CONFIGURE_ENV+=                LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
+CONFIGURE_ENV+=                LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib:${ALT_BOOTDIR}/lib/jli
 
 ALT_BOOTDIR=           ${WRKDIR}/bootstrap