Skip to content

build: fix external cmake path #5787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
htuch merged 3 commits into from
Jan 31, 2019
Merged

build: fix external cmake path #5787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82e2a68
build: fix external cmake path
lizan Jan 31, 2019
8cbfb7b
force libdir
lizan Jan 31, 2019
62b73b4
only nghttp2
lizan Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bazel/foreign_cc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ cmake_external(
"ENABLE_STATIC_LIB": "on",
"ENABLE_LIB_ONLY": "on",
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CMAKE_INSTALL_LIBDIR": "lib",
Copy link
Member Author

@lizan lizan Jan 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is due to in some platform it will pick lib64 and bazel won't pick built .a file. It was defined in previous nghttp2.sh

},
cmake_options = ["-GNinja"],
lib_source = "@com_github_nghttp2_nghttp2//:all",
Expand Down
12 changes: 6 additions & 6 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ def _com_github_c_ares_c_ares():
)
native.bind(
name = "ares",
actual = "//bazel/foreign_cc:ares",
actual = "@envoy//bazel/foreign_cc:ares",
)

def _com_github_cyan4973_xxhash():
Expand Down Expand Up @@ -456,7 +456,7 @@ def _com_github_jbeder_yaml_cpp():
)
native.bind(
name = "yaml_cpp",
actual = "//bazel/foreign_cc:yaml",
actual = "@envoy//bazel/foreign_cc:yaml",
)

def _com_github_libevent_libevent():
Expand All @@ -468,7 +468,7 @@ def _com_github_libevent_libevent():
)
native.bind(
name = "event",
actual = "//bazel/foreign_cc:event",
actual = "@envoy//bazel/foreign_cc:event",
)

def _com_github_madler_zlib():
Expand All @@ -480,7 +480,7 @@ def _com_github_madler_zlib():
)
native.bind(
name = "zlib",
actual = "//bazel/foreign_cc:zlib",
actual = "@envoy//bazel/foreign_cc:zlib",
)

def _com_github_nghttp2_nghttp2():
Expand All @@ -490,12 +490,12 @@ def _com_github_nghttp2_nghttp2():
build_file_content = BUILD_ALL_CONTENT,
patch_args = ["-p1"],
patch_cmds = ["find . -name '*.sh' -exec sed -i.orig '1s|#!/usr/bin/env sh\$|/bin/sh\$|' {} +"],
patches = ["//bazel/foreign_cc:nghttp2.patch"],
patches = ["@envoy//bazel/foreign_cc:nghttp2.patch"],
**location
)
native.bind(
name = "nghttp2",
actual = "//bazel/foreign_cc:nghttp2",
actual = "@envoy//bazel/foreign_cc:nghttp2",
)

def _io_opentracing_cpp():
Expand Down