From a10c2aee95b3830709f17d0cd11ec729c27593bb Mon Sep 17 00:00:00 2001 From: aouinizied Date: Sat, 26 Mar 2022 00:50:14 +0100 Subject: [PATCH] [WIP] Improve CI. --- nfstream/engine/dependencies/build.sh | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nfstream/engine/dependencies/build.sh b/nfstream/engine/dependencies/build.sh index e51eedb..7c53bb8 100755 --- a/nfstream/engine/dependencies/build.sh +++ b/nfstream/engine/dependencies/build.sh @@ -19,6 +19,7 @@ build_libpcap() { cd libpcap ./configure --enable-ipv6 --disable-universal --enable-dbus=no --without-libnl make + make DESTDIR=/tmp/nfstream_build install cd .. echo "---------------------------------------------------------------------------------------------------------------" echo "" @@ -62,9 +63,7 @@ build_libndpi() { cd nDPI ./autogen.sh ./configure CFLAGS="-I/tmp/nfstream_build/usr/local/include" LDFLAGS="-L/tmp/nfstream_build/usr/local/lib" --with-local-libgcrypt - cd src/lib make - cd ../.. echo "---------------------------------------------------------------------------------------------------------------" echo "" } @@ -77,6 +76,7 @@ fi build_libgpgerror build_libgcrypt build_libndpi +rm -rf /tmp/nfstream_build diff --git a/setup.py b/setup.py index 5ab2d5f..848bc8e 100644 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ class BuildNativeCommand(build_ext): ) print(build_script_command) msys2 = shutil.which('msys2') - subprocess.check_call([msys2, "-c", build_script_command]) + subprocess.check_call([msys2, "-c", build_script_command], shell=True) else: subprocess.check_call([str(BUILD_SCRIPT_PATH)], shell=True) # Build engine