diff options
author | tron <tron@pkgsrc.org> | 2007-06-25 13:05:56 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2007-06-25 13:05:56 +0000 |
commit | 61e6b81b1e3f193e6322eeaf2b2cbce8dd1539d5 (patch) | |
tree | 723cf4bf15fbb371afe7559462fd5b6fa3093071 /sysutils | |
parent | c1b612b88cc7c873160d079c274bf8ead0324f57 (diff) | |
download | pkgsrc-61e6b81b1e3f193e6322eeaf2b2cbce8dd1539d5.tar.gz |
Fix build problems with GCC 4.x if netboot support is enabled.
Patches provided by Dieter Roelants in PR pkg/36549.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/grub/Makefile | 3 | ||||
-rw-r--r-- | sysutils/grub/distinfo | 5 | ||||
-rw-r--r-- | sysutils/grub/patches/patch-ak | 14 | ||||
-rw-r--r-- | sysutils/grub/patches/patch-al | 22 | ||||
-rw-r--r-- | sysutils/grub/patches/patch-am | 22 |
5 files changed, 63 insertions, 3 deletions
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index c8a9f0cfe6f..161ae0f128f 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/12/17 19:21:42 jmmv Exp $ -# +# $NetBSD: Makefile,v 1.47 2007/06/25 13:05:56 tron Exp $ DISTNAME= grub-0.97 PKGREVISION= 7 diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo index 6bcb2298afd..5b5774d8c98 100644 --- a/sysutils/grub/distinfo +++ b/sysutils/grub/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2006/12/17 19:21:43 jmmv Exp $ +$NetBSD: distinfo,v 1.22 2007/06/25 13:05:56 tron Exp $ SHA1 (grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb RMD160 (grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 @@ -13,3 +13,6 @@ SHA1 (patch-ag) = 1dd709652d457ba03dda47b64d22cd9320f81e26 SHA1 (patch-ah) = ff62b64177a0e68400c32e013cb585526db94217 SHA1 (patch-ai) = 60088cf6786a364da37e19fbb5df4c6fd7641016 SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8 +SHA1 (patch-ak) = 8e67eb603e639ca47536cb191e7e29ec48b95642 +SHA1 (patch-al) = 58761e867ff182ad46c42b15575395ba8c38fbd6 +SHA1 (patch-am) = d848f67f7f21fa076751d14bd3235ae7351be1b7 diff --git a/sysutils/grub/patches/patch-ak b/sysutils/grub/patches/patch-ak new file mode 100644 index 00000000000..0771871450e --- /dev/null +++ b/sysutils/grub/patches/patch-ak @@ -0,0 +1,14 @@ +$NetBSD: patch-ak,v 1.3 2007/06/25 13:05:56 tron Exp $ + +--- /build/pkg_comp/default/pkg_comp/obj/pkgsrc/sysutils/grub/default/grub-0.97/netboot/etherboot.h 2003-07-09 13:45:37.000000000 +0200 ++++ netboot/etherboot.h 2007-06-24 15:28:38.000000000 +0200 +@@ -531,9 +531,7 @@ + extern int network_ready; + extern struct rom_info rom; + extern struct arptable_t arptable[MAX_ARP]; +-extern struct bootpd_t bootp_data; + #define BOOTP_DATA_ADDR (&bootp_data) +-extern unsigned char *end_of_rfc1533; + + /* config.c */ + extern struct nic nic; diff --git a/sysutils/grub/patches/patch-al b/sysutils/grub/patches/patch-al new file mode 100644 index 00000000000..f61ac04b7a0 --- /dev/null +++ b/sysutils/grub/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.3 2007/06/25 13:05:57 tron Exp $ + +--- /build/pkg_comp/default/pkg_comp/obj/pkgsrc/sysutils/grub/default/grub-0.97/netboot/sis900.c 2003-07-09 13:45:38.000000000 +0200 ++++ netboot/sis900.c 2007-06-24 18:15:38.000000000 +0200 +@@ -901,7 +901,7 @@ + const char *p) /* Packet */ + { + u32 status, to, nstype; +- u32 tx_status; ++ volatile u32 tx_status; + + /* Stop the transmitter */ + outl(TxDIS, ioaddr + cr); +@@ -940,7 +940,7 @@ + + to = currticks() + TX_TIMEOUT; + +- while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) ++ while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) + /* wait */ ; + + if (currticks() >= to) { diff --git a/sysutils/grub/patches/patch-am b/sysutils/grub/patches/patch-am new file mode 100644 index 00000000000..4f8079572fe --- /dev/null +++ b/sysutils/grub/patches/patch-am @@ -0,0 +1,22 @@ +$NetBSD: patch-am,v 1.3 2007/06/25 13:05:57 tron Exp $ + +--- /build/pkg_comp/default/pkg_comp/obj/pkgsrc/sysutils/grub/default/grub-0.97/netboot/natsemi.c 2003-07-09 13:45:38.000000000 +0200 ++++ netboot/natsemi.c 2007-06-24 18:25:21.000000000 +0200 +@@ -608,7 +608,7 @@ + const char *p) /* Packet */ + { + u32 status, to, nstype; +- u32 tx_status; ++ volatile u32 tx_status; + + /* Stop the transmitter */ + outl(TxOff, ioaddr + ChipCmd); +@@ -647,7 +647,7 @@ + + to = currticks() + TX_TIMEOUT; + +- while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) ++ while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) + /* wait */ ; + + if (currticks() >= to) { |