Make it more robust.
authorBen Pfaff <blp@cs.stanford.edu>
Mon, 3 Apr 2006 23:09:28 +0000 (23:09 +0000)
committerBen Pfaff <blp@cs.stanford.edu>
Mon, 3 Apr 2006 23:09:28 +0000 (23:09 +0000)
Apply Solaris patch, but only on Solaris.

src/misc/bochs-2.2.6-build.sh

index 137a2736a31ed420885db8d1b1498baf474fb579..fd2773d843e66c36f4328837e5c19fb6d1b9868e 100755 (executable)
@@ -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