From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 3 Apr 2006 23:09:28 +0000 (+0000)
Subject: Make it more robust.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=commitdiff_plain;h=edd39beb4deffa73f4ff0c4609ec437d357a5ea6

Make it more robust.
Apply Solaris patch, but only on Solaris.
---

diff --git a/src/misc/bochs-2.2.6-build.sh b/src/misc/bochs-2.2.6-build.sh
index 137a273..fd2773d 100755
--- a/src/misc/bochs-2.2.6-build.sh
+++ b/src/misc/bochs-2.2.6-build.sh
@@ -14,16 +14,20 @@ cd $$
 mkdir bochs-2.2.6
 tar xzf $SRCDIR/bochs-2.2.6.tar.gz
 cd bochs-2.2.6
-cat $PINTOSDIR/src/misc/bochs-2.2.6-*.patch | patch -p1
-
+cat $PINTOSDIR/src/misc/bochs-2.2.6-ms-extensions.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-big-endian.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-jitter.patch | patch -p1
+if test "`uname -s`" = "SunOS"; then
+    cat $PINTOSDIR/src/misc/bochs-2.2.6-solaris.patch | patch -p1
+fi
 CFGOPTS="--with-x --with-x11 --with-term --with-nogui --prefix=$DSTDIR"
-(mkdir plain &&
- cd plain && 
- ../configure $CFGOPTS --enable-gdb-stub && 
- make && 
- make install)
-(mkdir with-dbg &&
- cd with-dbg &&
- ../configure --enable-debugger $CFGOPTS &&
- make &&
- cp bochs $DSTDIR/bin/bochs-dbg)
+mkdir plain &&
+	cd plain && 
+	../configure $CFGOPTS --enable-gdb-stub && 
+	make && 
+	make install
+mkdir with-dbg &&
+	cd with-dbg &&
+	../configure --enable-debugger $CFGOPTS &&
+	make &&
+	cp bochs $DSTDIR/bin/bochs-dbg