Changeset 43611 in vbox

Timestamp:

Oct 11, 2012 9:26:26 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

81321

Message:

bcc/as86 are no longer required to compile the tree

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (3 diffs)
• debian/control (modified) (1 diff)
• src/VBox/Installer/linux/debian/control (modified) (1 diff)

trunk/Config.kmk

@@ -1748 +1748 @@
 # Intel ASL compiler for ACPI
 VBOX_IASLCMD   ?= $(firstword $(wildcard $(PATH_DEVTOOLS_BLD)/bin/iasl$(HOSTSUFF_EXE)) iasl$(HOSTSUFF_EXE))
-
-# Bruce's C compile is a C-compiler for BIOS-related 8086 code
-ifndef VBOX_BCC
- if exists "$(PATH_DEVTOOLS_BLD)/bin/bcc$(HOSTSUFF_EXE)"
-VBOX_BCC       := $(PATH_DEVTOOLS_BLD)/bin/bcc$(HOSTSUFF_EXE) -B $(PATH_DEVTOOLS_BLD)/bin/
- else
-VBOX_BCC       := bcc$(HOSTSUFF_EXE)
- endif
-endif
-
-# Assembler for BIOS-related 8086 code
-ifndef VBOX_AS86
- if exists "$(PATH_DEVTOOLS_BLD)/bin/as86$(HOSTSUFF_EXE)"
-VBOX_AS86      := $(PATH_DEVTOOLS_BLD)/bin/as86$(HOSTSUFF_EXE)
- else
-VBOX_AS86      := as86$(HOSTSUFF_EXE)
- endif
-endif
 
 # libxslt XSLT processor. (see PATH_TOOL_YASM for explanation why it's temporarily located in bin.)

trunk/configure

@@ -105 +105 @@
 CXX32=""
 CXX64=""
-BCC="bcc"
 YASM="yasm"
 IASL="iasl"
-AS86="as86"
 XSLTPROC="xsltproc"
 GENISOIMAGE="genisoimage"
@@ -486 +484 @@
 
 #
-# Check for the bcc compiler, needed for compiling the BIOS
-#
-check_bcc()
-{
-  test_header bcc
-  if check_avail "$BCC" BCC; then
-    bcc_ver=`$BCC -v 2>&1|grep version|sed 's+^bcc: version \(.*\)+\1+'`
-    if [ $? -ne 0 ]; then
-      log_failure "BCC not found"
-      fail
-    else
-      echo "compiling the following source file:" >> $LOG
-      cat > $ODIR.tmp_src.c << EOF
-int foo(a)
-  int a;
-{
-  return 0;
-}
-EOF
-      cat $ODIR.tmp_src.c >> $LOG
-      bcc_path=`which_wrapper $BCC`
-      bcc_dir="`dirname $bcc_path`/"
-      echo "using the following command line:" >> $LOG
-      echo "$BCC -B $bcc_dir -C-c -3 -S -o $ODIR.tmp_out $ODIR.tmp_src.c" >> $LOG
-      $BCC -B $bcc_dir -C-c -3 -S -o $ODIR.tmp_out $ODIR.tmp_src.c >> $LOG 2>&1
-      if [ $? -ne 0 ]; then
-        log_failure "BCC not working"
-        fail
-      else
-        log_success "found version $bcc_ver"
-        cnf_append "VBOX_BCC" "$bcc_path -B $bcc_dir"
-      fi
-      unset bcc_path
-      unset bcc_dir
-    fi
-  fi
-}
-
-
-#
-# Check for the as86 assembler, needed for compiling the BIOS
-#
-check_as86()
-{
-  test_header as86
-  if check_avail "$AS86" AS86; then
-    as86_ver=`$AS86 -v 2>&1|grep version|sed 's+^as86 version: \(.*\)+\1+'`
-    if [ $? -ne 0 ]; then
-      log_failure "as86 not found"
-      fail
-    else
-      log_success "found version $as86_ver"
-      cnf_append "VBOX_AS86" "`which_wrapper $AS86`"
-    fi
-  fi
-}
-
-
-#
 # Check for the OpenWatcom compiler, needed for compiling the BIOS
 #
@@ -2572 +2511 @@
 # the tools
 check_gcc
-[ "$OS" != "darwin"  ] && check_as86
-[ "$OS" != "darwin"  ] && check_bcc
 check_open_watcom
 [ "$OS" != "darwin"  ] && check_iasl

trunk/debian/control

@@ -6 +6 @@
 Build-Depends: debhelper (>= 5), libz-dev, libssl-dev, libqt4-dev,
   libqt4-opengl-dev, libsdl1.2-dev, uuid-dev, libxcursor-dev,
-  libidl-dev, libpam0g-dev, bcc, iasl, xsltproc, linux-headers-generic,
+  libidl-dev, libpam0g-dev, iasl, xsltproc, linux-headers-generic,
   wine, java2-runtime, lsb-release, g++-multilib [amd64],
   libc6-dev-i386 [amd64], ia32-libs [amd64], libasound-dev,

trunk/src/VBox/Installer/linux/debian/control

@@ -6 +6 @@
 Build-Depends: debhelper (>= 5), libz-dev, libssl-dev, libqt4-dev,
   libqt4-opengl-dev, libsdl1.2-dev, uuid-dev, libxcursor-dev,
-  libidl-dev, libpam0g-dev, bcc, iasl, xsltproc, linux-headers-generic,
+  libidl-dev, libpam0g-dev, iasl, xsltproc, linux-headers-generic,
   wine, java2-runtime, lsb-release, g++-multilib [amd64],
   libc6-dev-i386 [amd64], ia32-libs [amd64], libasound-dev,