From e703d2d31fb06745ee53b77133fc47b9ed0e4c46 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 22 Mar 2023 11:30:59 +1100 Subject: includes: Update to use the latest networking headers - Add support for BSP configs and options if we need them Closes #4882 --- netlegacy.py | 11 +++++++++++ wscript | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/netlegacy.py b/netlegacy.py index ebab745..981fd4a 100644 --- a/netlegacy.py +++ b/netlegacy.py @@ -46,15 +46,25 @@ for root, dirs, files in os.walk("."): if ext == '.h' and name not in exclude_headers: include_files[root[2:]].append(os.path.join(root, name)) + def find_node(bld, *paths): path = os.path.join(*paths) return os.path.relpath(str(bld.path.find_node(path))) + def install_file_list(*paths): path = os.path.join(*paths) file_list = [os.path.join(path, f) for f in os.listdir(path)] return file_list +def options(opt): + pass + + +def bsp_configure(conf, arch_bsp, mandatory = True): + pass + + def build(bld): include_path = [] ip = '' @@ -107,6 +117,7 @@ def build(bld): bld(target='network_objects', features='c', includes=ip, + defines=['IN_HISTORICAL_NETS=1'], source=source_files) bld(target='networking', diff --git a/wscript b/wscript index 518108b..c790707 100644 --- a/wscript +++ b/wscript @@ -49,10 +49,19 @@ def init(ctx): def options(opt): rtems.options(opt) + netlegacy.options(opt) + +def bsp_configure(conf, arch_bsp): + env = conf.env.derive() + ab = conf.env.RTEMS_ARCH_BSP + conf.msg('Configure variant: ', ab) + conf.setenv(ab, env) + netlegacy.bsp_configure(conf, arch_bsp) + conf.setenv(ab) def configure(conf): - rtems.configure(conf) + rtems.configure(conf, bsp_configure) def recurse(ctx): -- cgit v1.2.3