diff options
| author | pat <pat@FreeBSD.org> | 2002-06-19 01:07:13 +0000 |
|---|---|---|
| committer | pat <pat@FreeBSD.org> | 2002-06-19 01:07:13 +0000 |
| commit | 4b15256ea62457621fb4486639c3ecb11ee6b4e6 (patch) | |
| tree | b3bb8c2d4f0f930b2b3f4d3364d9bf033bb7d7f7 /emulators | |
| parent | eb8e1f01259729d9ba3afd2f704d80fa67315643 (diff) | |
| download | FreeBSD-ports-4b15256ea62457621fb4486639c3ecb11ee6b4e6.zip FreeBSD-ports-4b15256ea62457621fb4486639c3ecb11ee6b4e6.tar.gz | |
- Add patch which fixes build under certain configurations
PR: ports/38124
Submitted by: Leland Wang <llwang@infor.org>
- Fix build for -current and add WITH_NE2000 knob
PR: ports/38759
Submitted by: anholt
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/bochs/Makefile | 11 | ||||
| -rw-r--r-- | emulators/bochs/files/patch-configure.in | 21 | ||||
| -rw-r--r-- | emulators/bochs/files/patch-main.cc | 11 |
3 files changed, 42 insertions, 1 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index 10251c6..2e879f4 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -29,7 +29,7 @@ RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients USE_XLIB= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_AUTOCONF= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-cdrom \ --disable-split-hd @@ -63,6 +63,10 @@ CONFIGURE_ARGS+= --enable-debugger --enable-disasm CONFIGURE_ARGS+= --enable-x86-debugger .endif +.if defined(WITH_NE2000) +CONFIGURE_ARGS+= --enable-ne2000 +.endif + .if defined(WITH_SOUND) CONFIGURE_ARGS+= --enable-sb16=linux .endif @@ -109,6 +113,11 @@ pre-everything:: @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_X86_DEBUGGER=yes\"" @${ECHO_MSG} .endif +.if !defined(WITH_NE2000) + @${ECHO_MSG} "If you want to compile with networking (ne2000) support." + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_NE2000=yes\"" + @${ECHO_MSG} +.endif .if !defined(WITH_SOUND) @${ECHO_MSG} "If you want to compile with sound (blaster 16) support." @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SOUND=yes\"" diff --git a/emulators/bochs/files/patch-configure.in b/emulators/bochs/files/patch-configure.in new file mode 100644 index 0000000..a5a5aad --- /dev/null +++ b/emulators/bochs/files/patch-configure.in @@ -0,0 +1,21 @@ +--- configure.in.orig Wed Mar 27 17:20:32 2002 ++++ configure.in Thu May 30 21:32:01 2002 +@@ -101,8 +101,16 @@ + AC_CHECK_FUNCS(usleep, AC_DEFINE(BX_HAVE_USLEEP)) + AC_CHECK_FUNCS(nanosleep, AC_DEFINE(BX_HAVE_NANOSLEEP)) + AC_CHECK_FUNCS(abort, AC_DEFINE(BX_HAVE_ABORT)) +-AC_CHECK_TYPE(socklen_t, AC_DEFINE(BX_HAVE_SOCKLEN_T), , [#include <sys/socket.h>]) +- ++AC_MSG_CHECKING(for socklen_t) ++AC_TRY_COMPILE([#include <sys/types.h> ++ #include <sys/socket.h>], ++ [socklen_t x], ++ [ ++ AC_DEFINE(BX_HAVE_SOCKLEN_T) ++ AC_MSG_RESULT(yes) ++ ], ++ AC_MSG_RESULT(no) ++ ) + AC_MSG_CHECKING(for struct timeval) + AC_TRY_COMPILE([#include <sys/time.h>], + [struct timeval x;], diff --git a/emulators/bochs/files/patch-main.cc b/emulators/bochs/files/patch-main.cc new file mode 100644 index 0000000..f0f4130 --- /dev/null +++ b/emulators/bochs/files/patch-main.cc @@ -0,0 +1,11 @@ +--- main.cc.orig Thu May 16 04:26:43 2002 ++++ main.cc Thu May 16 04:26:55 2002 +@@ -1174,7 +1174,7 @@ + BX_MEM(0)->load_ROM(bx_options.vgarom.Opath->getptr (), 0xc0000); + BX_CPU(0)->init (BX_MEM(0)); + #if BX_SUPPORT_APIC +- BX_CPU(0)->local_apic.set_id (i); ++ BX_CPU(0)->local_apic.set_id (0); + #endif + BX_CPU(0)->reset(BX_RESET_HARDWARE); + #else |
