Thu Jun 15 03:20:59 2023 UTC ()
Add missing include paths for libz. Not used at the moment although.


(rin)
diff -r1.28 -r1.29 src/sys/stand/efiboot/Makefile.efiboot
cvs diff -r1.28 -r1.29 src/sys/stand/efiboot/Makefile.efiboot (expand / switch to unified diff)

--- src/sys/stand/efiboot/Makefile.efiboot 2023/06/03 21:26:29 1.28
+++ src/sys/stand/efiboot/Makefile.efiboot 2023/06/15 03:20:58 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.efiboot,v 1.28 2023/06/03 21:26:29 lukem Exp $ 1# $NetBSD: Makefile.efiboot,v 1.29 2023/06/15 03:20:58 rin Exp $
2 2
3S= ${.CURDIR}/../../.. 3S= ${.CURDIR}/../../..
4 4
5NOMAN= # defined 5NOMAN= # defined
6NOPIE= # defined 6NOPIE= # defined
7NOLIBCSANITIZER=# defined 7NOLIBCSANITIZER=# defined
8NOSANITIZER= # defined 8NOSANITIZER= # defined
9NORELRO= # defined 9NORELRO= # defined
10PROG?= boot.efi 10PROG?= boot.efi
11NEWVERSWHAT?= "efiboot" 11NEWVERSWHAT?= "efiboot"
12 12
13EFIDIR= ${S}/external/bsd/gnu-efi/dist 13EFIDIR= ${S}/external/bsd/gnu-efi/dist
14GNUEFIARCH?= ${MACHINE_CPU} 14GNUEFIARCH?= ${MACHINE_CPU}
@@ -122,26 +122,27 @@ SAMISCMAKEFLAGS+="SA_ENABLE_BIENDIAN=yes @@ -122,26 +122,27 @@ SAMISCMAKEFLAGS+="SA_ENABLE_BIENDIAN=yes
122.include "${S}/lib/libsa/Makefile.inc" 122.include "${S}/lib/libsa/Makefile.inc"
123LIBSA= ${SALIB} 123LIBSA= ${SALIB}
124 124
125### find out what to use for libkern 125### find out what to use for libkern
126KERN_AS= library 126KERN_AS= library
127LIBKERN_ARCH?= ${MACHINE_ARCH} 127LIBKERN_ARCH?= ${MACHINE_ARCH}
128KERNMISCMAKEFLAGS+="LIBKERN_ARCH=${LIBKERN_ARCH}" 128KERNMISCMAKEFLAGS+="LIBKERN_ARCH=${LIBKERN_ARCH}"
129.include "${S}/lib/libkern/Makefile.inc" 129.include "${S}/lib/libkern/Makefile.inc"
130LIBKERN= ${KERNLIB} 130LIBKERN= ${KERNLIB}
131 131
132### find out what to use for libz 132### find out what to use for libz
133Z_AS= library 133Z_AS= library
134.include "${S}/lib/libz/Makefile.inc" 134.include "${S}/lib/libz/Makefile.inc"
 135CPPFLAGS+= -I${S}/lib/libz -I${S}/../common/dist/zlib
135LIBZ= ${ZLIB} 136LIBZ= ${ZLIB}
136 137
137### find out what to use for libgnuefi 138### find out what to use for libgnuefi
138GNUEFI_AS= library 139GNUEFI_AS= library
139LIBGNUEFI_ARCH?= ${MACHINE_ARCH} 140LIBGNUEFI_ARCH?= ${MACHINE_ARCH}
140GNUEFIMISCMAKEFLAGS+="LIBGNUEFI_ARCH=${LIBGNUEFI_ARCH}" 141GNUEFIMISCMAKEFLAGS+="LIBGNUEFI_ARCH=${LIBGNUEFI_ARCH}"
141GNUEFIMISCCPPFLAGS+= -I${EFIDIR}/lib 142GNUEFIMISCCPPFLAGS+= -I${EFIDIR}/lib
142.include "${S}/lib/libgnuefi/Makefile.inc" 143.include "${S}/lib/libgnuefi/Makefile.inc"
143LIBGNUEFI= ${GNUEFILIB} 144LIBGNUEFI= ${GNUEFILIB}
144 145
145cleandir distclean: .WAIT cleanlibdir 146cleandir distclean: .WAIT cleanlibdir
146 147
147cleanlibdir: 148cleanlibdir: