From d0faf7557767309c304d23e79b542217c883b65e Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Sat, 16 Feb 2019 09:16:24 -0500
Subject: [PATCH] changes to support scons from peasoup-umbrella dir
Former-commit-id: 2af4f3995de9c2d5984bb37150863201dbd53e00
---
.gitignore | 4 ++++
SConscript | 8 ++------
SConscript.deep | 16 ++++++++++++++++
SConstruct | 5 ++++-
libIRDB-deep/src/SConscript | 1 +
libIRDB-deep/src/deep.cpp | 2 +-
libStructDiv/include/structured_diversity.h | 2 +-
pebliss/trunk/pe_lib/SConscript | 2 +-
8 files changed, 30 insertions(+), 10 deletions(-)
create mode 100644 SConscript.deep
diff --git a/.gitignore b/.gitignore
index 0688ae576..22fdae149 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,7 @@ tools/meds2pdb/meds2pdb
plugins_install/*.exe
plugins_install/*.so
*.swp
+*.os
+*.o
+
+scons_build
diff --git a/SConscript b/SConscript
index 324fbb1d4..3163a4a81 100644
--- a/SConscript
+++ b/SConscript
@@ -96,9 +96,6 @@ dump_map=SConscript("dump_map/SConscript", variant_dir='scons_build/dump_map')
dump_insns=SConscript("dump_insns/SConscript", variant_dir='scons_build/dump_insns')
ir_builders=SConscript("ir_builders/SConscript", variant_dir='scons_build/ir_builders')
-if int(env['build_deep']) == 1:
- libIRDBdeep=env.SConscript("libIRDB-deep/src/SConscript", variant_dir='scons_build/libIRDB-deep')
-
tools=None
if 'build_tools' not in env or env['build_tools'] is None or int(env['build_tools']) == 1:
@@ -124,14 +121,13 @@ libs=( libIRDBcore,
dump_insns,
ir_builders)
-if int(env['build_deep'] == 1):
- libs=libs+libIRDBdeep
-
if "PEDI_HOME" in os.environ:
Depends(pedi, libs)
Default( pedi )
+ Return('pedi')
else:
Default(libIRDBcore, libIRDBcfg, libIRDButil, libIRDBdeep, libIRDBcore, libehp,libtransform,libEXEIO,libMEDSannotation,libStructDiv,libElfDep, libcapstone, thanos, rida, meds2pdb, dump_map, dump_insns, ir_builders)
if 'build_tools' not in env or env['build_tools'] is None or int(env['build_tools']) == 1:
Default(tools)
+
diff --git a/SConscript.deep b/SConscript.deep
new file mode 100644
index 000000000..93a9b58df
--- /dev/null
+++ b/SConscript.deep
@@ -0,0 +1,16 @@
+import os
+
+Import('env')
+
+pedi = Command( target = "./testoutput",
+ source = "./SConscript",
+ action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
+
+env['BASE_IRDB_LIBS']="irdb-core", "pqxx", "pq"
+
+libIRDBdeep=env.SConscript("libIRDB-deep/src/SConscript", variant_dir='scons_build/libIRDB-deep')
+
+Depends(pedi, libIRDBdeep)
+Default( pedi )
+
+Return('pedi')
diff --git a/SConstruct b/SConstruct
index 1232a0c1d..870baa527 100644
--- a/SConstruct
+++ b/SConstruct
@@ -70,5 +70,8 @@ if sysname == "SunOS":
Export('env')
-SConscript("SConscript", variant_dir='build')
+if int(env['build_deep']) == 1:
+ SConscript("SConscript.deep", variant_dir='build')
+else:
+ SConscript("SConscript", variant_dir='build')
diff --git a/libIRDB-deep/src/SConscript b/libIRDB-deep/src/SConscript
index 5b4788ef9..15daf24c7 100644
--- a/libIRDB-deep/src/SConscript
+++ b/libIRDB-deep/src/SConscript
@@ -11,6 +11,7 @@ files= '''
cpppath='''
$IRDB_SDK/include/
$SECURITY_TRANSFORMS_HOME/include/
+ $SECURITY_TRANSFORMS_HOME/libIRDB-deep/src
$SECURITY_TRANSFORMS_HOME/libMEDSannotation/include
$SMPSA_HOME/include/
'''
diff --git a/libIRDB-deep/src/deep.cpp b/libIRDB-deep/src/deep.cpp
index f58324ad4..1ab77bc43 100644
--- a/libIRDB-deep/src/deep.cpp
+++ b/libIRDB-deep/src/deep.cpp
@@ -2,7 +2,7 @@
#include <map>
#include <set>
#include <memory>
-#include "deep.hpp"
+#include <deep.hpp>
#include <MEDS_DeadRegAnnotation.hpp>
#include <MEDS_MemoryRangeAnnotation.hpp>
#include <MEDS_SafeFuncAnnotation.hpp>
diff --git a/libStructDiv/include/structured_diversity.h b/libStructDiv/include/structured_diversity.h
index 3178f5158..a6eddd8e7 100644
--- a/libStructDiv/include/structured_diversity.h
+++ b/libStructDiv/include/structured_diversity.h
@@ -43,7 +43,7 @@ class StructuredDiversity_t
// pass marshalled value to DoBarrier
const vector<string> &string_res=DoBarrier(s.str());
- assert(string_res.size()==m_total_variants);
+ assert((size_t)string_res.size()==(size_t)m_total_variants);
/* declare a result */
vector<T> t_res;
diff --git a/pebliss/trunk/pe_lib/SConscript b/pebliss/trunk/pe_lib/SConscript
index 6e58fd457..e5270eac2 100644
--- a/pebliss/trunk/pe_lib/SConscript
+++ b/pebliss/trunk/pe_lib/SConscript
@@ -47,7 +47,7 @@ files= '''
'''
cpppath='''
- .
+ $SECURITY_TRANSFORMS_HOME/pebliss/trunk/pe_lib
'''
myenv=myenv.Clone(CPPPATH=Split(cpppath))
--
GitLab