From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 3 Apr 2006 23:51:21 +0000 (+0000)
Subject: Now it actually works.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aa68eefa46ec9583f5726bfd181087d46719af5;p=pintos-anon

Now it actually works.
---

diff --git a/src/misc/bochs-2.2.6-ms-extensions.patch b/src/misc/bochs-2.2.6-ms-extensions.patch
new file mode 100644
index 0000000..a6e50a0
--- /dev/null
+++ b/src/misc/bochs-2.2.6-ms-extensions.patch
@@ -0,0 +1,14 @@
+diff -urp orig/bochs-2.1.1/gui/Makefile.in bochs-2.1.1/gui/Makefile.in
+--- orig/bochs-2.1.1/gui/Makefile.in	2003-11-28 07:07:28.000000000 -0800
++++ bochs-2.1.1/gui/Makefile.in	2004-09-13 15:05:09.402039000 -0700
+@@ -44,7 +44,7 @@ SHELL = /bin/sh
+ @SET_MAKE@
+ 
+ CXX = @CXX@
+-CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@  @GUI_CXXFLAGS@
++CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@  @GUI_CXXFLAGS@ -fms-extensions
+ LOCAL_CXXFLAGS =
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+
+
diff --git a/src/misc/bochs-2.2.6-solaris.patch b/src/misc/bochs-2.2.6-solaris.patch
index c53bbec..5afef49 100644
--- a/src/misc/bochs-2.2.6-solaris.patch
+++ b/src/misc/bochs-2.2.6-solaris.patch
@@ -1,12 +1,11 @@
-diff -up /home/blp/cs140/bochs-2.2.6/gui/Makefile.in\~ /home/blp/cs140/bochs-2.2.6/gui/Makefile.in
---- bochs-2.2.6.orig/gui/Makefile.in	2004-12-13 11:10:35.000000000 -0800
-+++ bochs-2.2.6/gui/Makefile.in	2006-04-03 16:18:10.000000000 -0700
-@@ -46,7 +46,7 @@ SHELL = /bin/sh
- CXX = @CXX@
- CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@  @GUI_CXXFLAGS@
- LOCAL_CXXFLAGS =
+--- bochs-2.2.6.orig/Makefile.in	2006-04-03 16:34:51.170387000 -0700
++++ bochs-2.2.6/Makefile.in	2006-04-03 16:34:57.480303000 -0700
+@@ -93,7 +93,7 @@
+ CFLAGS = @CFLAGS@ @GUI_CFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) @DEFINE_PLUGIN_PATH@ -DBX_SHARE_PATH='"$(sharedir)"'
+ CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) @DEFINE_PLUGIN_PATH@ -DBX_SHARE_PATH='"$(sharedir)"'
+ 
 -LDFLAGS = @LDFLAGS@
 +LDFLAGS = @LDFLAGS@ -lsocket
  LIBS = @LIBS@
- X_CFLAGS = @X_CFLAGS@
- RANLIB = @RANLIB@
+ # To compile with readline:
+ #   linux needs just -lreadline