Changeset 11340 in vbox for trunk

Timestamp:

Aug 11, 2008 5:15:50 PM (17 years ago)

Author:

vboxsync

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

34482

Message:

Hack VBOX_LINUX_SRC for Linux >= 2.6.25. Fix VBOX_GCC_VERSION for openSUSE11.

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -1168 +1168 @@
 # This is kind of bad, the returned string needs to be re-evaluated before use.
 # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
+# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
 VBOX_GCC_VERSION = $(shell \
   $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\([0-9]\)\.\([0-9]\)|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, \2), \3)|' )
@@ -1530 +1531 @@
    export VBOX_LINUX_INCS           := $(VBOX_LINUX_SRC)/include
    # support splitted Linux kernels (make O=<build directory>)
+   # XXX hack alert!
    kernelsrc := $(shell $(SED_EXT) -ne 's+^KERNELSRC.*= *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
    ifneq ($(kernelsrc),)
     kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
+   else
+    # Linux >= 2.6.25
+    kernelpath := $(shell $(SED_EXT) -ne 's+^MAKEARGS *:= *-C *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
+   endif
+   ifneq ($(kernelpath),)
     VBOX_LINUX_INCS                 += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
    else