Changeset 50058 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jan 13, 2014 3:58:29 AM (11 years ago)

Author:

vboxsync

Message:

def_vbox_lwip_flags: Make it possible to supply additional compilation
flags to lwip from the client component by adding FOO_LWIP_INCS to
corresponding _INCS, ditto for _DEFS. This is intended for components
that use def_vbox_lwip_private and then call def_vbox_lwip_flags on a
few of its files that use lwip.

Adjust affected callers.

Not used by any component yet, but it makes it possible to supply
different lwipopt.h to different builds of lwip (coming soon in a
separate commit).

File:

• trunk/src/VBox/Devices/Network/lwip-new/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Devices/Network/lwip-new/Makefile.kmk

@@ -95 +95 @@
 
 
+
 define _def_vbox_lwip_use # VAR_BaseName, path/to/lwip/dir
   $(strip $1)_SOURCES += \
@@ -103 +104 @@
 endef
 
-define def_vbox_lwip_flags # VAR_BaseName, path/to/lwip/dir
-  $(strip $1)_INCS += $(foreach incdir, $(LWIP_INCS), $(strip $2)/$(incdir))
+
+define def_vbox_lwip_flags # PROTO_BaseName, VAR_BaseName, path/to/lwip/dir
+  # add anything configured for the component via PROTO_BaseName
+  $(foreach suffix, INCS DEFS,
+    $(if $(value $(strip $1)_LWIP_$(suffix)),
+      $(eval #
+        $(strip $2)_$(suffix) += $(value $(strip $1)_LWIP_$(suffix))
+      )))
+
+  # add lwip's own includes
+  $(strip $2)_INCS += $(foreach incdir, $(LWIP_INCS), $(strip $3)/$(incdir))
 endef
+
 
 ###
@@ -117 +128 @@
 define def_vbox_lwip_public # VAR_BaseName, path/to/lwip/dir
   $(eval $(call _def_vbox_lwip_use, $1, $2))
-  $(eval $(call def_vbox_lwip_flags, $1, $2))
+  $(eval $(call def_vbox_lwip_flags, $1, $1, $2))
 endef
+
 
 ###
@@ -131 +143 @@
   $(eval $(call _def_vbox_lwip_use, $1, $2))
   $(foreach file, $(LWIP_SOURCES), \
-    $(eval $(call def_vbox_lwip_flags, $(strip $2)/$(file), $2)))
+    $(eval $(call def_vbox_lwip_flags, $1, $(strip $2)/$(file), $2)))
 endef