OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Oct-2005 15:43:00
Branch: HEAD Handle: 2005101414430000
Modified files:
openpkg-src/bochs bochs.spec
Log:
Disable NE2000 NIC emulation on NetBSD (fixes vm11-ix86-netbsd2.0.2)
and ensure our includes and libs are picked up by C++ compiler (fixes
vm31-ix86-suse10.0)
Summary:
Revision Changes Path
1.46 +7 -4 openpkg-src/bochs/bochs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 bochs.spec
--- openpkg-src/bochs/bochs.spec 10 Oct 2005 12:18:41 -0000 1.45
+++ openpkg-src/bochs/bochs.spec 14 Oct 2005 13:43:00 -0000 1.46
@@ -33,7 +33,7 @@
Group: Misc
License: LGPL
Version: 2.2.1
-Release: 20051010
+Release: 20051014
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ -88,10 +88,13 @@
Makefile.in
# configure the sources
- CC="%{l_cc}" \
+ case "%{l_platform -t}" in
+ *-netbsd* ) NIC="--disable-ne2000" ;;
+ * ) NIC="--enable-ne2000" ;;
+ esac
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
- CXXFLAGS="%{l_cxxflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O} %{l_cppflags} %{l_ldflags}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
./configure \
@@ -102,7 +105,7 @@
--enable-cpu-level=5 \
--enable-all-optimizations \
--enable-cdrom \
- --enable-ne2000 \
+ $NIC \
--enable-compressed-hd \
--disable-shared
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
