Changeset 77504 in vbox

Timestamp:

Feb 28, 2019 12:37:43 PM (6 years ago)

Author:

vboxsync

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

129100

Message:

Add/linux: Workaround for GNU make that does not sport MAKEFILE_LIST (< 3.80). bugref:9172

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/linux/Makefile (modified) (1 diff)
• Additions/linux/drm/Makefile.module.kms (modified) (1 diff)
• Additions/linux/sharedfolders/Makefile.module (modified) (1 diff)
• Installer/linux/Makefile-header.gmk (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile ¶

@@ -25 +25 @@
 #
 
-# Find the directory of this makefile.
-VBOXGUEST_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
-
 # Linux kbuild sets this to our source directory if we are called from there
 obj ?= $(CURDIR)
 include $(obj)/Makefile-header.gmk
+VBOXGUEST_DIR = $(VBOX_MODULE_SRC_DIR)
 
 VBOXMOD_NAME = vboxguest

trunk/src/VBox/Additions/linux/drm/Makefile.module.kms ¶

@@ -18 +18 @@
 #
 
-# Find the directory of this makefile.
-VBOXDRM_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
-
 # Linux kbuild sets this to our source directory if we are called from there
 obj ?= $(CURDIR)
 include $(obj)/Makefile-header.gmk
+VBOXDRM_DIR = $(VBOX_MODULE_SRC_DIR)
 
 # We want to build on Linux 3.11 and later and on all EL 7 kernels.

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module ¶

@@ -18 +18 @@
 #
 
-# Find the directory of this makefile.
-VBOXSF_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
-
 # Linux kbuild sets this to our source directory if we are called from there
 obj ?= $(CURDIR)
 include $(obj)/Makefile-header.gmk
+VBOXSF_DIR = $(VBOX_MODULE_SRC_DIR)
 
 VBOXMOD_NAME = vboxsf

trunk/src/VBox/Installer/linux/Makefile-header.gmk ¶

@@ -174 +174 @@
 #
 ## @todo Drop this KBUILD_EXTMOD glue once it has been removed from all our makefiles (see sharedfolders).
+ifndef CURDIR # for make < v3.79
+ CURDIR := $(shell pwd)
+endif
 ifndef KBUILD_EXTMOD
- ifndef CURDIR # for make < v3.79
-  CURDIR := $(shell pwd)
- endif
  KBUILD_EXTMOD := $(CURDIR)
 endif
@@ -199 +199 @@
     rm -f /tmp/$(VBOX_DOLLAR)$(VBOX_DOLLAR).check.c; )
 
+#
+# Guess the module directory ASSUMING that this file is located in that directory.
+# Note! The special MAKEFILE_LIST variable was introduced in GNU make 3.80.
+#
+ifdef MAKEFILE_LIST
+ VBOX_MODULE_SRC_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+else
+ VBOX_MODULE_SRC_DIR := $(CURDIR)/
+endif
+
 
 # debug - show guesses.
@@ -210 +220 @@
 $(warning dbg: MODULE_DIR       = $(MODULE_DIR))
 $(warning dbg: KBUILD_EXTMOD    = $(KBUILD_EXTMOD))
-$(warning dbg: VBOX_ROOT_DIR    = $(VBOX_ROOT_DIR))
- endif
-endif
-
+$(warning dbg: VBOX_MODULE_SRC_DIR = $(VBOX_MODULE_SRC_DIR))
+ endif
+endif
+