From ce0e234bbd491763c6b1d26d422a694c066e45f8 Mon Sep 17 00:00:00 2001
From: Vijay Kumar Banerjee <vijay@rtems.org>
Date: Fri, 26 Feb 2021 23:23:01 -0700
Subject: pppd: Remove wscript

Build from netlegacy.py to make libpppd.a accessible to the tests
---
 netlegacy.py |  8 ++++++++
 pppd/wscript | 52 ----------------------------------------------------
 2 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 pppd/wscript

diff --git a/netlegacy.py b/netlegacy.py
index 559fa17..91cbedd 100644
--- a/netlegacy.py
+++ b/netlegacy.py
@@ -55,10 +55,13 @@ def build(bld):
     include_path = []
     ip = ''
     bsp = bld.env.RTEMS_ARCH_BSP.split('-')[-1]
+    pppd_source = [os.path.join('./pppd', s)
+                   for s in os.listdir('./pppd') if s[-2:] == '.c']
 
     bsp_dirs, bsp_sources = bsp_drivers.bsp_files(bld)
 
     include_path.extend(['.',
+                         './include',
                          os.path.relpath(bld.env.PREFIX),
                          './testsuites/include',
                          os.path.relpath(os.path.join(bld.env.PREFIX,
@@ -101,6 +104,11 @@ def build(bld):
                 includes=ip,
                 use='networking',
                 source=test_source)
+    bld.stlib(target='pppd',
+              features='c',
+              includes=ip,
+              use='networking',
+              source=pppd_source)
 
     bld.install_files(os.path.join('${PREFIX}', arch_lib_path),
                       ["libnetworking.a"])
diff --git a/pppd/wscript b/pppd/wscript
deleted file mode 100644
index 6da2f6d..0000000
--- a/pppd/wscript
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# RTEMS Project (https://www.rtems.org/)
-#
-# Copyright (c) 2021 Vijay Kumar Banerjee <vijaykumar9597@gmail.com>.
-# All rights reserved.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#  1. Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from rtems_waf import rtems
-import os
-
-def init(ctx):
-    pass
-
-def configure(conf):
-    pass
-
-def build(bld):
-    source_files = []
-    include_path = ['./', '../', os.path.relpath(bld.env.PREFIX)]
-    arch_lib_path = rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION,
-                                           bld.env.RTEMS_ARCH_BSP)
-    for root, dirs, files in os.walk("./pppd"):
-        for name in files:
-            if name[-2:] == '.c':
-                source_files.append(os.path.join('./', name))
-
-    bld.stlib(target = 'pppd',
-              features = 'c',
-              cflags = ['-O2', '-g'],
-              includes = include_path,
-              source = source_files)
-    bld.install_files(os.path.join('${PREFIX}', arch_lib_path), ['libpppd.a'])
-- 
cgit v1.2.3