diff options
| author | maya <maya@pkgsrc.org> | 2018-05-09 01:18:06 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2018-05-09 01:18:06 +0000 |
| commit | c98447bb704a42bab42180b22c1c546b1aa116e1 (patch) | |
| tree | af350402ff16e5560be1fab2021895611e7556b1 /sysutils | |
| parent | ca405419c33a9ae9807be1a7aa52a06ce7c95661 (diff) | |
| download | pkgsrc-c98447bb704a42bab42180b22c1c546b1aa116e1.tar.gz | |
grub2: build-tested fixes for netbsd
don't -Werror
try to paxctl +m grub-script-check, because it tries to enable
executable stack (?!)
assume ssp/fortify won't work, typical in bootloaders. not tested if necessary.
bump PKGREVISION.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/grub2/Makefile | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile index 8a6349af010..af940961a48 100644 --- a/sysutils/grub2/Makefile +++ b/sysutils/grub2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2016/05/17 10:32:09 fhajny Exp $ +# $NetBSD: Makefile,v 1.10 2018/05/09 01:18:06 maya Exp $ DISTNAME= grub-2.00 PKGNAME= ${DISTNAME:S/grub/grub2/} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.gnu.org/gnu/grub/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -16,7 +16,7 @@ CONFLICTS= grub-[0-9]* ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 -USE_TOOLS+= gmake flex bison gettext:run +USE_TOOLS+= gmake flex bison gettext:run awk GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -24,9 +24,13 @@ CONFIGURE_ARGS+= --disable-efiemu CONFIGURE_ARGS+= --disable-grub-emu-usb CONFIGURE_ARGS+= --disable-grub-emu-sdl CONFIGURE_ARGS+= --disable-grub-emu-pci +CONFIGURE_ARGS+= --disable-werror INFO_FILES= yes USE_PKGLOCALEDIR= yes +SSP_SUPPORTED= no +FORTIFY_SUPPORTED= no + .include "../../mk/bsd.prefs.mk" # @@ -139,6 +143,14 @@ SUBST_FILES.fix-sed-tabs= util/grub.d/*.in SUBST_SED.fix-sed-tabs= -e 's,\\t, ,g' # +# grub-script-check crashes from enabling executable stack, paxctl +m it if possible. +# +post-configure: + ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig + ${RUN}${AWK} '/^grub-script-check.1:/{print;print "\t-paxctl +m grub-script-check";next}1' \ + ${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile + +# # Remove executable bit from non-executable files. # post-install: |