Thu Jun 4 20:17:19 2020 UTC ()
grub2: Fix missing interpreter in bulk build

pkgsrc changes:
---------------
  * Include lang/python/tool.mk so that PYTHON_FOR_BUILD_ONLY is taken into
    account.
  * Pull {SSP,FORTIFY}_SUPPORTED up to put them before inclusion of
    mk/bsd.prefs.mk (/!\ lang/python/tool.mk includes mk/bsd.prefs.mk).


(triaxx)
diff -r1.23 -r1.24 pkgsrc/sysutils/grub2/Makefile
cvs diff -r1.23 -r1.24 pkgsrc/sysutils/grub2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/grub2/Makefile 2020/05/09 17:21:32 1.23
+++ pkgsrc/sysutils/grub2/Makefile 2020/06/04 20:17:19 1.24
@@ -1,46 +1,48 @@ @@ -1,46 +1,48 @@
1# $NetBSD: Makefile,v 1.23 2020/05/09 17:21:32 triaxx Exp $ 1# $NetBSD: Makefile,v 1.24 2020/06/04 20:17:19 triaxx Exp $
2 2
3DISTNAME= grub-2.04 3DISTNAME= grub-2.04
4PKGNAME= ${DISTNAME:S/grub/grub2/} 4PKGNAME= ${DISTNAME:S/grub/grub2/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ftp://ftp.gnu.org/gnu/grub/ 7MASTER_SITES= ftp://ftp.gnu.org/gnu/grub/
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.gnu.org/software/grub/ 11HOMEPAGE= https://www.gnu.org/software/grub/
12COMMENT= GRand Unified Bootloader, version 2 12COMMENT= GRand Unified Bootloader, version 2
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15CONFLICTS= grub-[0-9]* 15CONFLICTS= grub-[0-9]*
16 16
17ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 17ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64
18 18
 19SSP_SUPPORTED= no
 20FORTIFY_SUPPORTED= no
 21
19USE_LANGUAGES+= c c++ 22USE_LANGUAGES+= c c++
20USE_TOOLS+= gmake flex bison gettext:run awk pkg-config 23USE_TOOLS+= gmake flex bison gettext:run awk pkg-config
 24
 25.include "../../lang/python/tool.mk"
21PYTHON_FOR_BUILD_ONLY= tool 26PYTHON_FOR_BUILD_ONLY= tool
22 27
23GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
25CONFIGURE_ARGS+= --disable-efiemu 30CONFIGURE_ARGS+= --disable-efiemu
26CONFIGURE_ARGS+= --disable-grub-emu-sdl 31CONFIGURE_ARGS+= --disable-grub-emu-sdl
27CONFIGURE_ARGS+= --disable-grub-emu-pci 32CONFIGURE_ARGS+= --disable-grub-emu-pci
28INFO_FILES= yes 33INFO_FILES= yes
29USE_PKGLOCALEDIR= yes 34USE_PKGLOCALEDIR= yes
30 35
31SSP_SUPPORTED= no 
32FORTIFY_SUPPORTED= no 
33 
34.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
35 37
36CFLAGS+= -Wno-unused-value 38CFLAGS+= -Wno-unused-value
37 39
38# 40#
39# Build requirements, taken from the INSTALL file in GRUB's distribution: 41# Build requirements, taken from the INSTALL file in GRUB's distribution:
40# 42#
41# - GCC >= 4.1.3 (in fact >= 4.4 is required for a successful build) 43# - GCC >= 4.1.3 (in fact >= 4.4 is required for a successful build)
42# - Flex >= 2.5.35 44# - Flex >= 2.5.35
43# - gettext >= 0.17 (the need for >= 0.17 seems to only concern msgfmt) 45# - gettext >= 0.17 (the need for >= 0.17 seems to only concern msgfmt)
44# 46#
45# Additionnaly, help2man is required to generate the manual pages. 47# Additionnaly, help2man is required to generate the manual pages.
46# 48#