build: add --shared-lief configure flag

Author: aduh95

.github/workflows/test-shared.yml

@@ -198,7 +198,7 @@ jobs:
             --arg ccache '(import <nixpkgs> {}).sccache' \
             --arg devTools '[]' \
             --arg benchmarkTools '[]' \
-            ${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
+            ${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withLief false --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
             --run '
                 make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
             '

Makefile

@@ -1239,6 +1239,7 @@ ifeq ($(SKIP_SHARED_DEPS), 1)
 	$(RM) -r $(TARNAME)/deps/histogram
 	$(RM) -r $(TARNAME)/deps/icu-small
 	$(RM) -r $(TARNAME)/deps/icu-tmp
+	$(RM) -r $(TARNAME)/deps/LIEF
 	$(RM) -r $(TARNAME)/deps/llhttp
 	$(RM) -r $(TARNAME)/deps/nbytes
 	$(RM) -r $(TARNAME)/deps/nghttp2

configure.py

@@ -357,6 +357,28 @@
     dest='shared_libuv_libpath',
     help='a directory to search for the shared libuv DLL')
 
+shared_optgroup.add_argument('--shared-lief',
+    action='store_true',
+    dest='shared_lief',
+    default=None,
+    help='link to a shared lief DLL instead of static linking')
+
+shared_optgroup.add_argument('--shared-lief-includes',
+    action='store',
+    dest='shared_lief_includes',
+    help='directory containing lief header files')
+
+shared_optgroup.add_argument('--shared-lief-libname',
+    action='store',
+    dest='shared_lief_libname',
+    default='LIEF',
+    help='alternative lib name to link to [default: %(default)s]')
+
+shared_optgroup.add_argument('--shared-lief-libpath',
+    action='store',
+    dest='shared_lief_libpath',
+    help='a directory to search for the shared lief DLL')
+
 shared_optgroup.add_argument('--shared-nbytes',
     action='store_true',
     dest='shared_nbytes',
@@ -2101,6 +2123,14 @@ def without_ssl_error(option):
 
   o['variables']['openssl_version'] = get_openssl_version(o)
 
+def configure_lief(o):
+  if options.without_lief:
+    if options.shared_lief:
+      error(f'--without-lief is incompatible with --shared-lief')
+    return
+
+  configure_library('lief', o, pkgname='LIEF')
+
 def configure_sqlite(o):
   o['variables']['node_use_sqlite'] = b(not options.without_sqlite)
   if options.without_sqlite:
@@ -2562,6 +2592,7 @@ def make_bin_override():
 configure_library('nghttp2', output, pkgname='libnghttp2')
 configure_library('nghttp3', output, pkgname='libnghttp3')
 configure_library('ngtcp2', output, pkgname='libngtcp2')
+configure_lief(output);
 configure_sqlite(output);
 configure_library('temporal_capi', output)
 configure_library('uvwasi', output)

node.gyp

@@ -18,6 +18,7 @@
     'node_shared_hdr_histogram%': 'false',
     'node_shared_http_parser%': 'false',
     'node_shared_libuv%': 'false',
+    'node_shared_lief%': 'false',
     'node_shared_nbytes%': 'false',
     'node_shared_nghttp2%': 'false',
     'node_shared_openssl%': 'false',
@@ -1000,10 +1001,13 @@
             'deps/ncrypto/ncrypto.gyp:ncrypto',
           ],
         }],
-        [ 'node_use_lief=="true"', {
+        [ 'node_use_lief=="true" and node_shared_lief=="false"', {
           'defines': [ 'HAVE_LIEF=1' ],
           'dependencies': [ 'deps/LIEF/lief.gyp:liblief' ],
         }],
+        [ 'node_use_lief=="true" and node_shared_lief=="true"', {
+          'defines': [ 'HAVE_LIEF=1' ],
+        }],
         [ 'node_use_sqlite=="true"', {
           'sources': [
             '<@(node_sqlite_sources)',

shell.nix

@@ -12,12 +12,14 @@
   # Build options
   icu ? pkgs.icu,
   withAmaro ? true,
+  withLief ? true,
   withSQLite ? true,
   withSSL ? true,
   withTemporal ? false,
   sharedLibDeps ? import ./tools/nix/sharedLibDeps.nix {
     inherit
       pkgs
+      withLief
       withSQLite
       withSSL
       withTemporal
@@ -80,6 +82,7 @@ pkgs.mkShell {
     ]
     ++ extraConfigFlags
     ++ pkgs.lib.optional (!withAmaro) "--without-amaro"
+    ++ pkgs.lib.optional (!withLief) "--without-lief"
     ++ pkgs.lib.optional (!withSQLite) "--without-sqlite"
     ++ pkgs.lib.optional (!withSSL) "--without-ssl"
     ++ pkgs.lib.optional withTemporal "--v8-enable-temporal-support"

tools/nix/sharedLibDeps.nix

@@ -1,5 +1,6 @@
 {
   pkgs ? import ./pkgs.nix { },
+  withLief ? true,
   withSQLite ? true,
   withSSL ? true,
   withTemporal ? false,
@@ -33,6 +34,9 @@
     ];
   };
 }
+// (pkgs.lib.optionalAttrs withLief {
+  inherit (pkgs) lief;
+})
 // (pkgs.lib.optionalAttrs withSQLite {
   inherit (pkgs) sqlite;
 })