rpms/bochs/devel bochs.spec,1.20,1.21
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Sep 22 20:25:58 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7593
Modified Files:
bochs.spec
Log Message:
* Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-2
- Add -debugger and -gdb sub packages which contain special versions of
bochs compiled with the buildin debugger resp. the gdb-stub (bz 206508)
Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bochs.spec 27 Aug 2006 11:33:41 -0000 1.20
+++ bochs.spec 22 Sep 2006 20:25:58 -0000 1.21
@@ -1,8 +1,6 @@
-%bcond_with debugger
-
Name: bochs
Version: 2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Portable x86 PC emulator
Group: Applications/Emulators
License: LGPL
@@ -30,6 +28,26 @@
enough of the x86 CPU, related AT hardware, and BIOS to run DOS,
Windows '95, Minix 2.0, and other OS's, all on your workstation.
+
+%package debugger
+Summary: Bochs with builtin debugger
+Group: Applications/Emulators
+Requires: %{name} = %{version}-%{release}
+
+%description debugger
+Special version of bochs compiled with the builtin debugger.
+
+
+%package gdb
+Summary: Bochs with support for debugging with gdb
+Group: Applications/Emulators
+Requires: %{name} = %{version}-%{release}
+
+%description gdb
+Special version of bochs compiled with a gdb stub so that the software running
+inside the emulator can be debugged with gdb.
+
+
%package dlxlinux
Summary: DLX Linux hard disk image for Bochs
Group: Applications/Emulators
@@ -60,14 +78,12 @@
%ifarch %{ix86} x86_64
ARCH_CONFIGURE_FLAGS=--with-svga
%endif
-export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
# Note: the CPU level, MMX et al affect what the emulator will emulate, they
# are not properties of the build target architecture.
-%configure \
+CONFIGURE_FLAGS=" \
--enable-plugins \
--enable-ne2000 \
--enable-pci \
- %{?with_debugger:--enable-debugger} \
--enable-all-optimizations \
--enable-vbe \
--enable-clgd54xx \
@@ -79,11 +95,23 @@
--with-rfb \
--with-sdl \
--with-wx \
- $ARCH_CONFIGURE_FLAGS
+ $ARCH_CONFIGURE_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS -DPARANOID"
+%configure $CONFIGURE_FLAGS --enable-x86-debugger --enable-debugger
make %{?_smp_mflags}
-make unpack_dlx
+mv bochs bochs-debugger
+make dist-clean
+
+%configure $CONFIGURE_FLAGS --enable-x86-debugger --enable-gdb-stub
+make %{?_smp_mflags}
+mv bochs bochs-gdb
+make dist-clean
+%configure $CONFIGURE_FLAGS
+make %{?_smp_mflags}
+
+make unpack_dlx
# This needs to be done after "make unpack_dlx".
%{__patch} -p0 < %{PATCH1}
sed -i -e 's/\r//' dlxlinux/readme.txt dlxlinux/bochsrc.txt
@@ -92,6 +120,7 @@
%install
rm -rf $RPM_BUILD_ROOT _installed-docs
make install install_dlx DESTDIR=$RPM_BUILD_ROOT
+install -m 755 bochs-debugger bochs-gdb $RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT%{_docdir}/bochs _installed-docs
@@ -115,6 +144,14 @@
%{_datadir}/bochs/*BIOS*
%{_datadir}/bochs/keymaps/
+%files debugger
+%defattr(-,root,root,-)
+%{_bindir}/bochs-debugger
+
+%files gdb
+%defattr(-,root,root,-)
+%{_bindir}/bochs-gdb
+
%files dlxlinux
%defattr(-,root,root,-)
%{_bindir}/bochs-dlx
@@ -123,6 +160,10 @@
%changelog
+* Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-2
+- Add -debugger and -gdb sub packages which contain special versions of
+ bochs compiled with the buildin debugger resp. the gdb-stub (bz 206508)
+
* Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-1
- New upstream version 2.3 (final)
More information about the scm-commits
mailing list