From 0d54bda605232d8d4b45e33274e579f6d98118b9 Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Fri, 15 Jan 2021 12:38:05 -0500 Subject: Switched to using system libwebsockets for RPM builds. (#10507) * Switched to using system libwebsockets for RPM builds. Also cleans up the configure statement in the RPM spec file. * Add version requirement for LWS dep and only use native on platforms that meet it. --- .travis/package_management/common.py | 2 ++ 1 file changed, 2 insertions(+) (limited to '.travis') diff --git a/.travis/package_management/common.py b/.travis/package_management/common.py index 61cf358737..4cc04b93f3 100755 --- a/.travis/package_management/common.py +++ b/.travis/package_management/common.py @@ -111,6 +111,7 @@ def install_common_dependendencies(container): run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-devel"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-c-devel"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-compiler"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libwebsockets-devel"]) elif str(os.environ["REPO_TOOL"]).count("apt-get") == 1: run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "g++"]) @@ -132,6 +133,7 @@ def install_common_dependendencies(container): run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-devel"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-c-devel"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-compiler"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libwebsockets-devel"]) if os.environ["BUILD_STRING"].count("el/6") <= 0: run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "autogen"]) -- cgit v1.2.3