[PATCH] waf: Ensure network-config.h gets installed

[Kinsey Moore]

Sorry, this should have had rtems-libbsd in the subject prefix.


Kinsey

On 7/2/2021 20:16, Kinsey Moore wrote:
> network-config.h is now required for application compilation when using
> nexus-devices.h. This makes sure that it gets installed to resolve build
> errors.
> ---
>   waf_libbsd.py | 14 ++++++++++++--
>   1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/waf_libbsd.py b/waf_libbsd.py
> index bb4182e3..4d8788c6 100644
> --- a/waf_libbsd.py
> +++ b/waf_libbsd.py
> @@ -198,6 +198,8 @@ class Builder(builder.ModuleManager):
>           config = self.getConfiguration()
>           module_header_path = "rtems/bsd"
>           module_header_name = "modules.h"
> +        network_config_header_path = "rtems/bsd/test"
> +        network_config_header_name = "network-config.h"
>   
>           #
>           #
> @@ -312,8 +314,11 @@ class Builder(builder.ModuleManager):
>                   for t in tags:
>                       if lhs == t:
>                           sed += "-e 's/@%s@/%s/' " % (t, rhs)
> -        bld(target="testsuite/include/rtems/bsd/test/network-config.h",
> -            source="testsuite/include/rtems/bsd/test/network-config.h.in",
> +        network_config_h_file_path = os.path.join("testsuite/include",
> +                                                  network_config_header_path,
> +                                                  network_config_header_name)
> +        bld(target=network_config_h_file_path,
> +            source=network_config_h_file_path + ".in",
>               rule=sed + " < ${SRC} > ${TGT}",
>               update_outputs=True)
>   
> @@ -575,6 +580,11 @@ class Builder(builder.ModuleManager):
>                             modules_h_file_with_path,
>                             cwd=bld.path)
>   
> +        bld.install_files(os.path.join("${PREFIX}", arch_inc_path,
> +                                       network_config_header_path),
> +                          network_config_h_file_path,
> +                          cwd=bld.path)
> +
>           #
>           # Tests
>           #