Skip to content

Commit 0a999a1

Browse files
namanahujafacebook-github-bot
authored andcommitted
Add linux package names to be installed while running GA
Summary: We need these packages to be installed to run BUCK2 builds on Ubuntu Reviewed By: bigfootjon Differential Revision: D59696213 fbshipit-source-id: 6fc7b50e15c816872439db3796d043ab1d7174f6
1 parent 047e7d6 commit 0a999a1

File tree

6 files changed

+9
-1
lines changed

6 files changed

+9
-1
lines changed

shim/third-party/boost/boost.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ load("@shim//third-party:third_party.bzl", "third_party_library")
1010
def boost_libs(xs):
1111
third_party_library(
1212
name = "boost",
13+
ubuntu_package_name = "libboost-all-dev",
1314
homebrew_package_name = "boost",
1415
)
1516
for x in xs:

shim/third-party/glog/BUCK

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ third_party_library(
1313
name = "glog",
1414
homebrew_package_name = "glog",
1515
pkgconfig_name = "libglog",
16+
ubuntu_package_name = "libgoogle-glog-dev",
1617
deps = ["shim//third-party/gflags:gflags"],
1718
)

shim/third-party/libevent/BUCK

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ oncall("open_source")
1212
third_party_library(
1313
name = "libevent",
1414
pkgconfig_name = "libevent",
15+
ubuntu_package_name = "libevent-dev",
1516
)

shim/third-party/libsodium/BUCK

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ third_party_library(
1313
name = "sodium",
1414
homebrew_package_name = "libsodium",
1515
pkgconfig_name = "libsodium",
16+
ubuntu_package_name = "libsodium-dev",
1617
)

shim/third-party/libunwind/BUCK

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ oncall("open_source")
1212
third_party_library(
1313
name = "unwind",
1414
pkgconfig_name = "libunwind",
15+
ubuntu_package_name = "libunwind-dev",
1516
)

shim/third-party/third_party.bzl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,17 @@ def homebrew_library(
5252
labels = labels,
5353
)
5454

55-
def third_party_library(name, visibility = ["PUBLIC"], deps = [], homebrew_package_name = None, pkgconfig_name = None, homebrew_header_path = None, default_target_platform = "prelude//platforms:default", homebrew_linker_flags = None):
55+
def third_party_library(name, visibility = ["PUBLIC"], deps = [], homebrew_package_name = None, ubuntu_package_name = None, pkgconfig_name = None, homebrew_header_path = None, default_target_platform = "prelude//platforms:default", homebrew_linker_flags = None):
5656
# Labels defined here are used to extract third-party libs so they can be installed:
5757
labels = []
5858
if homebrew_package_name != None:
5959
labels.append("third-party:homebrew:" + homebrew_package_name)
60+
if ubuntu_package_name != None:
61+
labels.append("third-party:ubuntu:" + ubuntu_package_name)
6062

6163
if pkgconfig_name != None:
6264
labels.append("third-party:homebrew:pkg-config")
65+
labels.append("third-party:ubuntu:pkg-config")
6366
external_pkgconfig_library(name = pkgconfig_name, visibility = visibility if name == pkgconfig_name else [], labels = labels, default_target_platform = default_target_platform, deps = deps)
6467
if name != pkgconfig_name:
6568
native.alias(name = name, actual = ":{}".format(pkgconfig_name), visibility = visibility)

0 commit comments

Comments
 (0)