From d69053ce26b91964edec73209dc3e5c8e3debbee Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Mon, 30 Jul 2018 14:46:24 +0000
Subject: [PATCH] added libehp as part of build
Former-commit-id: b233f4a38cab5330571f7fe6b0b5c749cd56e11e
---
.gitmodules | 3 +++
SConscript | 14 ++++++++++----
libehp | 1 +
3 files changed, 14 insertions(+), 4 deletions(-)
create mode 160000 libehp
diff --git a/.gitmodules b/.gitmodules
index 48c10c452..4b0edb347 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
shallow = true
path = libcapstone
url = https://github.com/aquynh/capstone.git
+[submodule "libehp"]
+ path = libehp
+ url = git@git.zephyr-software.com:allnp/libehp.git
diff --git a/SConscript b/SConscript
index e903bf206..9c5aa6879 100644
--- a/SConscript
+++ b/SConscript
@@ -58,10 +58,15 @@ else:
env['BASE_IRDB_LIBS']="IRDB-core", "pqxx", "pq", "EXEIO"
+pedi = Command( target = "./testoutput",
+ source = "./SConscript",
+ action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
+
if sysname != "SunOS":
libPEBLISS=SConscript("pebliss/trunk/pe_lib/SConscript", variant_dir='scons_build/libPEBLISS')
# setup libraries needed for linking
env['BASE_IRDB_LIBS']="IRDB-core", "pqxx", "pq", "EXEIO", "pebliss"
+ Depends(pedi,libPEBLISS)
# pebliss requires iconv, which needs to be explicit on cygwin.
if "CYGWIN" in sysname:
@@ -70,6 +75,9 @@ if "CYGWIN" in sysname:
Export('env')
+libehp=env.SConscript("libehp/SConscript", variant_dir='scons_build/libehp')
+libehp=env.Install("$SECURITY_TRANSFORMS_HOME/lib", libehp);
+
libtransform=SConscript("libtransform/SConscript", variant_dir='scons_build/libtransform')
libEXEIO=SConscript("libEXEIO/SConscript", variant_dir='scons_build/libEXEIO')
libbea=SConscript("beaengine/SConscript", variant_dir='scons_build/beaengine')
@@ -79,10 +87,8 @@ libIRDB=SConscript("libIRDB/SConscript", variant_dir='scons_build/libIRDB')
libStructDiv=SConscript("libStructDiv/SConscript", variant_dir='scons_build/libStructDiv')
libElfDep=SConscript("libElfDep/SConscript", variant_dir='scons_build/libElfDep')
-pedi = Command( target = "./testoutput",
- source = "./SConscript",
- action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
-Depends(pedi, (libEXEIO, libbea, libMEDSannotation,libxform,libtransform,libIRDB,libStructDiv, libElfDep))
+
+Depends(pedi, (libehp,libtransform,libEXEIO,libbea,libMEDSannotation,libxform,libIRDB,libStructDiv,libElfDep))
tools=None
if 'build_tools' not in env or env['build_tools'] is None or int(env['build_tools']) == 1:
diff --git a/libehp b/libehp
new file mode 160000
index 000000000..59da9c4c4
--- /dev/null
+++ b/libehp
@@ -0,0 +1 @@
+Subproject commit 59da9c4c4856423c6e7a2add814c7c2f5efd26f1
--
GitLab