Skip to content

Commit b832725

Browse files
committed
archive is not installed on all setup make it optional
Signed-off-by: Hanoh Haim <[email protected]>
1 parent 25c6181 commit b832725

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

linux_dpdk/ws_main.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ def options(opt):
151151
opt.add_option('--with-ntacc', dest='with_ntacc', default=False, action='store_true', help="Use Napatech dpdk driver. Use with ./b configure --with-ntacc.")
152152
opt.add_option('--with-bird', default=False, action='store_true', help="Build Bird server. Use with ./b configure --with-bird.")
153153
opt.add_option('--new-memory', default=False, action='store_true', help="Build by new DPDK memory subsystem.")
154+
opt.add_option('--with-archive', default=False, action='store_true', help="Build with lib archive")
154155
opt.add_option('--no-ver', action = 'store_true', help = "Don't update version file.")
155156
opt.add_option('--no-old', action = 'store_true', help = "Don't build old targets.")
156157
opt.add_option('--private', dest='private', action = 'store_true', help = "private publish, do not replace latest/be_latest image with this image")
@@ -830,6 +831,7 @@ def configure(conf):
830831
with_sanitized = conf.options.sanitized
831832
new_memory = conf.options.new_memory
832833

834+
833835
configure_sanitized(conf, with_sanitized)
834836

835837
conf.env.NO_MLX = no_mlx
@@ -887,8 +889,9 @@ def configure(conf):
887889
write_file(os.path.join(conf.bldnode.abspath(), H_DPDK_CONFIG), s)
888890

889891
conf.env.DPDK_WITH_ARCHIVE = False
890-
if conf.check_cxx(lib = 'archive', errmsg = 'Could not find libarchive', mandatory = False):
891-
conf.env.DPDK_WITH_ARCHIVE = True
892+
if conf.options.with_archive:
893+
if conf.check_cxx(lib = 'archive', errmsg = 'Could not find libarchive', mandatory = False):
894+
conf.env.DPDK_WITH_ARCHIVE = True
892895

893896
def search_in_paths(paths):
894897
for path in paths:

0 commit comments

Comments
 (0)