From bbdd3dd622eff93eee0341a866f64b7896547015 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Jul 2003 17:35:04 +0000 Subject: Fix grub-install problem reported in PR 22049 by Soren Jacobsen. While here, convert to USE_NEW_TEXINFO, and make it compile. [freestanding, but using nested functions; gcc emits __enable_exec_stack, which lives in libgcc, but is not linked because the program is supposed to be freestanding. Provide dummy __enable_exec_stack function.] Bump PKGREVISION. --- sysutils/grub/Makefile | 7 +++---- sysutils/grub/PLIST | 6 +----- sysutils/grub/distinfo | 6 ++++-- sysutils/grub/patches/patch-ah | 8 ++++---- sysutils/grub/patches/patch-ai | 13 +++++++++++++ sysutils/grub/patches/patch-aj | 15 +++++++++++++++ 6 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 sysutils/grub/patches/patch-ai create mode 100644 sysutils/grub/patches/patch-aj (limited to 'sysutils') diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 2778d764ba7..2548ff106fb 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2003/07/13 13:53:17 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2003/07/13 17:35:04 wiz Exp $ # DISTNAME= grub-0.93 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ @@ -14,6 +14,7 @@ ONLY_FOR_PLATFORM= *-*-i386 GNU_CONFIGURE= YES USE_GMAKE= YES +USE_NEW_TEXINFO= YES USE_BUILDLINK2= YES .include "../../mk/bsd.prefs.mk" @@ -41,6 +42,4 @@ CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS} .include "../../devel/binutils/buildlink2.mk" .include "../../devel/ncurses/buildlink2.mk" - -.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST index 7e37c56adb0..dd4574634a1 100644 --- a/sysutils/grub/PLIST +++ b/sysutils/grub/PLIST @@ -1,14 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2003/01/24 23:49:54 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/07/13 17:35:04 wiz Exp $ bin/mbchk -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/grub.info info/grub.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/grub.info info/grub.info-1 info/grub.info-2 info/grub.info-3 -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/multiboot.info info/multiboot.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/multiboot.info man/man1/mbchk.1 man/man8/grub-install.8 man/man8/grub-md5-crypt.8 diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo index 4c6b3f9ba43..a366e9701dc 100644 --- a/sysutils/grub/distinfo +++ b/sysutils/grub/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2003/03/14 23:35:24 thorpej Exp $ +$NetBSD: distinfo,v 1.5 2003/07/13 17:35:04 wiz Exp $ SHA1 (grub-0.93.tar.gz) = 51cc79b0088f8e0e3260e33dc5b2ea5055bfc8f8 Size (grub-0.93.tar.gz) = 891032 bytes @@ -9,4 +9,6 @@ SHA1 (patch-ad) = 8a39ae6da142493672d11521fd99594a6161a1d0 SHA1 (patch-ae) = fc41e5b3db06d3e2fa33913946e1eb31a93f435f SHA1 (patch-af) = 0955009cd1b09b766b3aab5517b36002c6c08401 SHA1 (patch-ag) = ecbbcf164039cbc047b247036fa183bb8ae08a6f -SHA1 (patch-ah) = e71b2aa77e597e1501bcee9cb27123793a22dda7 +SHA1 (patch-ah) = cecaf3e1510a3fdba2d3412b59c434d5d247b11b +SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba +SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8 diff --git a/sysutils/grub/patches/patch-ah b/sysutils/grub/patches/patch-ah index 61e2b37f173..fb4024563cd 100644 --- a/sysutils/grub/patches/patch-ah +++ b/sysutils/grub/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1 2003/03/14 23:35:26 thorpej Exp $ +$NetBSD: patch-ah,v 1.2 2003/07/13 17:35:05 wiz Exp $ ---- stage2/Makefile.in.orig 2003-03-14 15:24:54.000000000 -0800 -+++ stage2/Makefile.in 2003-03-14 15:25:06.000000000 -0800 -@@ -158,7 +158,7 @@ +--- stage2/Makefile.in.orig Fri Nov 29 21:28:45 2002 ++++ stage2/Makefile.in +@@ -158,7 +158,7 @@ PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-T @HERCULES_SUPPORT_TRUE@HERCULES_FLAGS = -DSUPPORT_HERCULES=1 @HERCULES_SUPPORT_FALSE@HERCULES_FLAGS = diff --git a/sysutils/grub/patches/patch-ai b/sysutils/grub/patches/patch-ai new file mode 100644 index 00000000000..e009a07623a --- /dev/null +++ b/sysutils/grub/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2003/07/13 17:35:05 wiz Exp $ + +--- util/grub-install.in.orig Mon May 20 13:21:50 2002 ++++ util/grub-install.in +@@ -297,7 +297,7 @@ fi + # Stage 1.5 does not exist. + + # Create the GRUB directory if it is not present. +-test -d "$bootdir" || mkdir "$bootdir" || exit 1 ++test -z "$bootdir" || test -d "$bootdir" || mkdir "$bootdir" || exit 1 + test -d "$grubdir" || mkdir "$grubdir" || exit 1 + + # If --recheck is specified, remove the device map, if present. diff --git a/sysutils/grub/patches/patch-aj b/sysutils/grub/patches/patch-aj new file mode 100644 index 00000000000..4bedc906b15 --- /dev/null +++ b/sysutils/grub/patches/patch-aj @@ -0,0 +1,15 @@ +$NetBSD: patch-aj,v 1.1 2003/07/13 17:35:06 wiz Exp $ + +--- stage2/bios.c.orig Sun Dec 30 08:33:23 2001 ++++ stage2/bios.c +@@ -20,6 +20,10 @@ + + #include "shared.h" + ++void __enable_execute_stack(void *addr) ++{ ++} ++ + + /* These are defined in asm.S, and never be used elsewhere, so declare the + prototypes here. */ -- cgit v1.2.3