diff options
| author | ambrisko <ambrisko@FreeBSD.org> | 2004-12-09 02:31:42 +0800 |
|---|---|---|
| committer | ambrisko <ambrisko@FreeBSD.org> | 2004-12-09 02:31:42 +0800 |
| commit | 76b72fc0ceefb0cc3a2d9c02d3b7c8dc3037373b (patch) | |
| tree | 781d210a27ea0607cec4f09df31c6f3caaccad35 | |
| parent | e7c6ad3855f43fb56385817fea8571731bc20d1b (diff) | |
| download | freebsd-ports-gnome-76b72fc0ceefb0cc3a2d9c02d3b7c8dc3037373b.tar.gz freebsd-ports-gnome-76b72fc0ceefb0cc3a2d9c02d3b7c8dc3037373b.tar.zst freebsd-ports-gnome-76b72fc0ceefb0cc3a2d9c02d3b7c8dc3037373b.zip | |
Fix build error on 4.X and 6.X. Different problems though.
| -rw-r--r-- | net/etherboot/files/patch-af | 50 | ||||
| -rw-r--r-- | net/etherboot/pkg-descr | 2 |
2 files changed, 51 insertions, 1 deletions
diff --git a/net/etherboot/files/patch-af b/net/etherboot/files/patch-af new file mode 100644 index 000000000000..b7cb6c3d893f --- /dev/null +++ b/net/etherboot/files/patch-af @@ -0,0 +1,50 @@ +--- ./arch/i386/include/bits/string.h.orig Sat Dec 4 09:31:24 2004 ++++ ./arch/i386/include/bits/string.h Sat Dec 4 09:33:37 2004 +@@ -65,9 +65,10 @@ __asm__ __volatile__( + return dest; + } + ++#ifndef __FreeBSD__ + #define memcmp __builtin_memcmp + #define __HAVE_ARCH_MEMCMP +- ++#endif + + #define __HAVE_ARCH_MEMSET + static inline void *memset(void *s, int c,size_t count) +--- drivers/disk/ide_disk.c.orig Sat Dec 4 09:24:19 2004 ++++ drivers/disk/ide_disk.c Sat Dec 4 15:57:18 2004 +@@ -592,7 +592,8 @@ static int init_drive(struct harddisk_in + info->sectors_per_track * + info->heads * + info->cylinders; +- printf(__FUNCTION__ " sectors_per_track=[%d], heads=[%d], cylinders=[%d]\n", ++ printf("%s sectors_per_track=[%d], heads=[%d], cylinders=[%d]\n", ++ __FUNCTION__, + info->sectors_per_track, + info->heads, + info->cylinders); +--- drivers/net/3c509.c.orig Sat Dec 4 16:08:56 2004 ++++ drivers/net/3c509.c Sat Dec 4 16:11:59 2004 +@@ -620,9 +620,9 @@ static int t509_probe(struct dev *dev, u + dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR); + dev->devid.device_id = htons(0x80f7); + return 1; ++ } + no3c509: + /* printf("(probe fail)"); */ +- } + return 0; + } + +--- util/makerom.pl.orig Mon Dec 6 08:36:43 2004 ++++ util/makerom.pl Mon Dec 6 08:36:54 2004 +@@ -19,8 +19,6 @@ use strict; + + use vars qw(%opts); + +-use bytes; +- + sub getromsize ($) { + my ($romref) = @_; + my $i; diff --git a/net/etherboot/pkg-descr b/net/etherboot/pkg-descr index 23f4d81591ec..4192ba412955 100644 --- a/net/etherboot/pkg-descr +++ b/net/etherboot/pkg-descr @@ -7,7 +7,7 @@ The defaults used here are suited to boot FreeBSD ELF kernels over NFS. To produce an etherboot floppy (or HD partition) do - cd work/etherboot/src + cd work/etherboot-5.2.4/src cat bin/boot1a.bin bin/<device>.zrom > /dev/fd0 Replace <device> with the specific code for your card, and /dev/fd0 |