diff --git a/build/fbcode_builder/manifests/glog b/build/fbcode_builder/manifests/glog index 2649eaad1805..b4a8fabecc2a 100644 --- a/build/fbcode_builder/manifests/glog +++ b/build/fbcode_builder/manifests/glog @@ -24,7 +24,7 @@ HAVE_TR1_UNORDERED_SET=OFF [homebrew] glog -# on ubuntu glog brings in liblzma-dev, which in turn breaks watchman tests +# on ubuntu this pulls in libunwind < 1.8.0 which breaks watchman tests [debs.not(distro=ubuntu)] libgoogle-glog-dev diff --git a/build/fbcode_builder/manifests/libunwind b/build/fbcode_builder/manifests/libunwind index dfaa64f4f6f2..43a1ca9a7cfd 100644 --- a/build/fbcode_builder/manifests/libunwind +++ b/build/fbcode_builder/manifests/libunwind @@ -5,7 +5,7 @@ name = libunwind libunwind-devel libunwind -# on ubuntu this brings in liblzma-dev, which in turn breaks watchman tests +# libunwind < 1.8.0 breaks watchman tests [debs.not(distro=ubuntu)] libunwind-dev diff --git a/build/fbcode_builder/manifests/xz b/build/fbcode_builder/manifests/xz index 22f38ae2739c..670111081506 100644 --- a/build/fbcode_builder/manifests/xz +++ b/build/fbcode_builder/manifests/xz @@ -1,8 +1,7 @@ [manifest] name = xz -# ubuntu's package causes watchman's tests to hang -[debs.not(distro=ubuntu)] +[debs] liblzma-dev [homebrew]