Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 236692
Collapse All | Expand All

(-)Config.kmk.orig (-8 / +8 lines)
Lines 165-177 Link Here
165
# This indicates that additions (of some kind or another) is being _built_.
165
# This indicates that additions (of some kind or another) is being _built_.
166
# VBOX_WITHOUT_ADDITIONS overrides it.
166
# VBOX_WITHOUT_ADDITIONS overrides it.
167
#if1of ($(KBUILD_TARGET), freebsd linux os2 solaris win)
167
#if1of ($(KBUILD_TARGET), freebsd linux os2 solaris win)
168
if1of ($(KBUILD_TARGET), linux solaris win)
168
#if1of ($(KBUILD_TARGET), linux solaris win)
169
 VBOX_WITH_ADDITIONS = 1
169
# VBOX_WITH_ADDITIONS = 1
170
endif
170
#endif
171
# Build the optional ring-0 part of the additions for syntax checking.
171
# Build the optional ring-0 part of the additions for syntax checking.
172
# (Except when cross-building on linux since we're using /usr/src/...)
172
# (Except when cross-building on linux since we're using /usr/src/...)
173
ifn1of ($(KBUILD_TARGET).$(KBUILD_HOST_ARCH).$(KBUILD_TARGET_ARCH), linux.x86.amd64 linux.amd64.x86)
173
ifn1of ($(KBUILD_TARGET).$(KBUILD_HOST_ARCH).$(KBUILD_TARGET_ARCH), linux.x86.amd64 linux.amd64.x86)
174
 VBOX_WITH_ADDITION_DRIVERS = 1
174
# VBOX_WITH_ADDITION_DRIVERS = 1
175
endif
175
endif
176
# Build X11 additions. Can be disabled separately.
176
# Build X11 additions. Can be disabled separately.
177
if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd solaris)
177
if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd solaris)
Lines 229-235 Link Here
229
# Activate this to force the VM to pre-allocate the guest RAM before startup
229
# Activate this to force the VM to pre-allocate the guest RAM before startup
230
VBOX_WITH_PREALLOC_RAM_BY_DEFAULT =
230
VBOX_WITH_PREALLOC_RAM_BY_DEFAULT =
231
# The kernel driver/module and related runtime libraries.
231
# The kernel driver/module and related runtime libraries.
232
VBOX_WITH_VBOXDRV = 1
232
#VBOX_WITH_VBOXDRV = 1
233
# build with secure label support
233
# build with secure label support
234
ifeq ($(filter win.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) # too much work with freetype and all that.
234
ifeq ($(filter win.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) # too much work with freetype and all that.
235
VBOX_WITH_SECURELABEL = 1
235
VBOX_WITH_SECURELABEL = 1
Lines 242-248 Link Here
242
# The SDL based GUI.
242
# The SDL based GUI.
243
VBOX_WITH_VBOXSDL = 1
243
VBOX_WITH_VBOXSDL = 1
244
# The basic frontend (w/o Main).
244
# The basic frontend (w/o Main).
245
VBOX_WITH_VBOXBFE = 1
245
#VBOX_WITH_VBOXBFE = 1
246
# The Qt GUI.
246
# The Qt GUI.
247
VBOX_WITH_QTGUI = 1
247
VBOX_WITH_QTGUI = 1
248
# The Qt 4 GUI.
248
# The Qt 4 GUI.
Lines 278-286 Link Here
278
# Enable the kchmviewer
278
# Enable the kchmviewer
279
VBOX_WITH_KCHMVIEWER = 1
279
VBOX_WITH_KCHMVIEWER = 1
280
# Build the testsuite.
280
# Build the testsuite.
281
VBOX_WITH_TESTSUITE = 1
281
#VBOX_WITH_TESTSUITE = 1
282
# Build the testcases.
282
# Build the testcases.
283
VBOX_WITH_TESTCASES = 1
283
#VBOX_WITH_TESTCASES = 1
284
# Set this to not use COM or XPCOM in places where it can be avoided.
284
# Set this to not use COM or XPCOM in places where it can be avoided.
285
#VBOX_WITHOUT_COM = 1
285
#VBOX_WITHOUT_COM = 1
286
# Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems
286
# Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems
(-)configure.orig (-6 / +6 lines)
Lines 1959-1972 Link Here
1959
# some things are not available in for OSE
1959
# some things are not available in for OSE
1960
if [ $OSE -ge 1 ]; then
1960
if [ $OSE -ge 1 ]; then
1961
  cnf_append "VBOX_OSE" "1"
1961
  cnf_append "VBOX_OSE" "1"
1962
  cnf_append "VBOX_WITH_TESTSUITE" ""
1962
#  cnf_append "VBOX_WITH_TESTSUITE" ""
1963
  cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
1963
  cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
1964
1964
1965
  if [ "$OS" = "linux" ]; then
1965
#  if [ "$OS" = "linux" ]; then
1966
    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
1966
#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
1967
  else
1967
#  else
1968
    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
1968
#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
1969
  fi
1969
#  fi
1970
  echo >> $CNF
1970
  echo >> $CNF
1971
fi
1971
fi
1972
1972

Return to bug 236692