contrib: Shift vpp build -> rules_foreign_cc
#27243
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,9 +2,9 @@ load( | |
| "//bazel:envoy_build_system.bzl", | ||
| "envoy_cc_contrib_extension", | ||
| "envoy_cc_library", | ||
| "envoy_cmake", | ||
| "envoy_contrib_package", | ||
| ) | ||
| load("@base_pip3//:requirements.bzl", "requirement") | ||
|
|
||
| licenses(["notice"]) # Apache 2 | ||
|
|
@@ -20,6 +20,7 @@ cc_library( | |
| "external/libvlibmemoryclient.a", | ||
| "external/libvppcom.a", | ||
| "external/libvppinfra.a", | ||
| "external/vppcom.h", | ||
| ], | ||
| hdrs = ["external/vppcom.h"], | ||
| defines = ["VPP_VCL"], | ||
|
|
@@ -28,37 +29,63 @@ cc_library( | |
| visibility = ["//visibility:public"], | ||
| ) | ||
|
|
||
| envoy_cmake( | ||
| name = "build", | ||
| build_data = [requirement("ply")], | ||
| cache_entries = { | ||
| "CMAKE_BUILD_TYPE": "Release", | ||
| "VPP_API_TEST_BUILTIN": "OFF", | ||
| "BUILD_SHARED_LIBS": "OFF", | ||
| "CMAKE_ENABLE_TESTING": "OFF", | ||
| "CMAKE_ENABLE_EXPORTS": "OFF", | ||
| }, | ||
| # build_args = ["--", "-C", ".", "vppcom"], | ||
phlax marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| copts = ["-Wno-unused-variable"], | ||
| default_cache_entries = {}, | ||
| env = { | ||
| "PLYPATHS": "$(locations %s)" % requirement("ply"), | ||
| }, | ||
| lib_source = "@com_github_fdio_vpp_vcl//:all", | ||
| linkopts = ["-Wno-unused-variable"], | ||
| out_static_libs = [ | ||
| "libvppcom.a", | ||
| "libvppinfra.a", | ||
| "libsvm.a", | ||
| "libvlibmemoryclient.a", | ||
| ], | ||
| postfix_script = """ | ||
| mkdir -p $INSTALLDIR/lib/external $INSTALLDIR/include/external \ | ||
| && find . -name "*.a" | xargs -I{} cp -a {} $INSTALLDIR/lib/ \ | ||
| && find . -name "*.h" | xargs -I{} cp -a {} $INSTALLDIR/include | ||
| """, | ||
| tags = [ | ||
| "cpu:16", | ||
| "skip_on_windows", | ||
| ], | ||
| # tags = ["no-remote", "skip_on_windows"], | ||
phlax marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| targets = [ | ||
| "", | ||
| "install", | ||
| ], | ||
| working_directory = "src", | ||
| ) | ||
|
|
||
| genrule( | ||
|
There was a problem hiding this comment. not sure which bit of that approach you mean, but that is the issue ideally we do this with rules_foreign_cc - doing it with a genrule requires getting a hermetic cmake toolchain, which i think is not trivial with foreign_cc (not sure why the documented example doesnt seem to work, and it was for There was a problem hiding this comment. There was a problem hiding this comment.
this should be easy - ive certainly found it so with other toolchains that ive worked with possibly we could do something similar to how we fish out the zstd bin here https://github.com/envoyproxy/envoy/blob/main/tools/zstd/zstd.bzl - altho its a little different as cmake/ninja are provided as a toolchain rather than just a tool tbh tho its just fighting the system - the better, easier to maintain way would be to get the cmake <> foreign_cc setup correct i think |
||
| name = "build_files", | ||
| outs = [ | ||
| "external/libsvm.a", | ||
| "external/libvlibmemoryclient.a", | ||
| "external/libvppcom.a", | ||
| "external/libvppinfra.a", | ||
| "external/vppcom.h", | ||
| ], | ||
| cmd = """ | ||
| EXTERNAL_DIR=$$(dirname $(location external/libsvm.a)) \ | ||
| && mkdir -p $$EXTERNAL_DIR \ | ||
| && find . -name "*.a" | xargs -I{} cp -a {} $$EXTERNAL_DIR \ | ||
| && find . -name "vppcom.h" | xargs -I{} cp -a {} $$EXTERNAL_DIR | ||
| """, | ||
| exec_tools = [":build"], | ||
| ) | ||
|
|
||
| envoy_cc_library( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure why this is enforced - i think in the case of vpp we want it to be
ReleaseThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i'd have to dig up the history, there was a reason