Repository: kudu Updated Branches: refs/heads/branch-1.7.x 5c68767d3 -> 5ef577b65
KUDU-2346: Fix mac pkg-config issue. Previously an empty return string from pkg-config --cflags was used as a proxy for testing if the package was installed. The MacOs version of pkg-config returns an error message in response to this command when a package is not installed. The fix is to property test the return value of pkg-config --cflags. Change-Id: I8a6b543dc65ac65d0dedf7e39f735b4805612bf1 Reviewed-on: http://gerrit.cloudera.org:8080/9652 Reviewed-by: Alexey Serbin <aser...@cloudera.com> Tested-by: Alexey Serbin <aser...@cloudera.com> (cherry picked from commit 9f6b7f16828250a89e0e331026eeb05687c6eeab) Reviewed-on: http://gerrit.cloudera.org:8080/10373 Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/5ef577b6 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/5ef577b6 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/5ef577b6 Branch: refs/heads/branch-1.7.x Commit: 5ef577b657f0e06b38cc2ce6e31f1b0b46eeab4d Parents: 5c68767 Author: Attila Bukor <abu...@cloudera.com> Authored: Sat May 12 10:59:56 2018 +0200 Committer: Alexey Serbin <aser...@cloudera.com> Committed: Mon May 14 18:02:09 2018 +0000 ---------------------------------------------------------------------- thirdparty/build-thirdparty.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/5ef577b6/thirdparty/build-thirdparty.sh ---------------------------------------------------------------------- diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index f91bc1f..beb8f97 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -171,8 +171,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then # Build against the Macports or Homebrew OpenSSL versions, in order to match # the Kudu build. - OPENSSL_CFLAGS=$(pkg-config --cflags openssl) - if [ -z $OPENSSL_CFLAGS ]; then + if ! OPENSSL_CFLAGS=$(pkg-config --cflags openssl); then # If OpenSSL is built via Homebrew, pkg-config does not report on cflags. homebrew_openssl_dir=/usr/local/opt/openssl if [ -d $homebrew_openssl_dir ]; then