From 38358597f9380e9098eb5642169ad23c169df98e Mon Sep 17 00:00:00 2001 From: Gregory Brail Date: Thu, 9 Apr 2020 10:25:04 -0700 Subject: [PATCH 1/2] Add specific shell command support for FreeBSD. The main change is to use the versions of cp and ln from the coreutils package, which support all the options that Bazel is expecting -- the default versions do not. --- .../toolchains/impl/bsd_commands.bzl | 158 ++++++++++++++++++ .../toolchains/toolchain_mappings.bzl | 6 + 2 files changed, 164 insertions(+) create mode 100644 tools/build_defs/shell_toolchain/toolchains/impl/bsd_commands.bzl diff --git a/tools/build_defs/shell_toolchain/toolchains/impl/bsd_commands.bzl b/tools/build_defs/shell_toolchain/toolchains/impl/bsd_commands.bzl new file mode 100644 index 000000000..708ba51c2 --- /dev/null +++ b/tools/build_defs/shell_toolchain/toolchains/impl/bsd_commands.bzl @@ -0,0 +1,158 @@ +load("@rules_foreign_cc//tools/build_defs/shell_toolchain/toolchains:function_and_call.bzl", "FunctionAndCall") + +_REPLACE_VALUE = "\${EXT_BUILD_DEPS}" + +def os_name(): + return "bsd" + +def pwd(): + return "$(pwd)" + +def echo(text): + return "printf \"{text}\"".format(text = text) + +def export_var(name, value): + return "export {name}={value}".format(name = name, value = value) + +def local_var(name, value): + return "local {name}={value}".format(name = name, value = value) + +def use_var(name): + return "$" + name + +def env(): + return "env" + +def path(expression): + return "export PATH=\"{expression}:$PATH\"".format(expression = expression) + +def touch(path): + return "touch " + path + +def mkdirs(path): + return "mkdir -p " + path + +def tmpdir(): + return "$(mktemp -d)" + +def if_else(condition, if_text, else_text): + return """ +if [ {condition} ]; then + {if_text} +else + {else_text} +fi +""".format(condition = condition, if_text = if_text, else_text = else_text) + +def define_function(name, text): + lines = [] + lines += ["function " + name + "() {"] + for line_ in text.splitlines(): + lines += [" " + line_] + lines += ["}"] + return "\n".join(lines) + +def replace_in_files(dir, from_, to_): + return FunctionAndCall( + text = """if [ -d "$1" ]; then + find -L $1 -type f \ + \( -name "*.pc" -or -name "*.la" -or -name "*-config" -or -name "*.cmake" \) \ + -exec sed -i 's@'"$2"'@'"$3"'@g' {} ';' +fi +""", + ) + +def copy_dir_contents_to_dir(source, target): + return """gcp -L -r --no-target-directory "{}" "{}" """.format(source, target) + +def symlink_contents_to_dir(source, target): + text = """local target="$2" +mkdir -p $target +if [[ -f $1 ]]; then + ##symlink_to_dir## $1 $target + return 0 +fi + +if [[ -d $1 || -L $1 ]]; then + local children=$(find -H $1 -maxdepth 1 -mindepth 1) + for child in $children; do + ##symlink_to_dir## $child $target + done +fi +""" + return FunctionAndCall(text = text) + +def symlink_to_dir(source, target): + text = """local target="$2" +mkdir -p ${target} + +if [[ -d $1 ]]; then + gln -s -t ${target} $1 +elif [[ -f $1 ]]; then + gln -s -t ${target} $1 +elif [[ -L $1 ]]; then + gcp --no-target-directory $1 ${target} +else + echo "Can not copy $1" +fi +""" + return FunctionAndCall(text = text) + +def script_prelude(): + return "set -e" + +def increment_pkg_config_path(source): + text = """local children=$(find $1 -mindepth 1 -name '*.pc') +# assume there is only one directory with pkg config +for child in $children; do + export PKG_CONFIG_PATH="$$PKG_CONFIG_PATH$$:$(dirname $child)" + return +done +""" + return FunctionAndCall(text = text) + +def cat(filepath): + return "cat \"{}\"".format(filepath) + +def redirect_out_err(from_process, to_file): + return from_process + " &> " + to_file + +def assert_script_errors(): + return "set -e" + +def cleanup_function(on_success, on_failure): + text = "\n".join([ + "local ecode=$?", + "if [ $ecode -eq 0 ]; then", + on_success, + "else", + on_failure, + "fi", + ]) + return FunctionAndCall(text = text, call = "trap \"cleanup_function\" EXIT") + +def children_to_path(dir_): + text = """if [ -d {dir_} ]; then + local tools=$(find $EXT_BUILD_DEPS/bin -maxdepth 1 -mindepth 1) + for tool in $tools; + do + if [[ -d \"$tool\" ]] || [[ -L \"$tool\" ]]; then + export PATH=$PATH:$tool + fi + done +fi""".format(dir_ = dir_) + return FunctionAndCall(text = text) + +def define_absolute_paths(dir_, abs_path): + return "##replace_in_files## {dir_} {REPLACE_VALUE} {abs_path}".format( + dir_ = dir_, + REPLACE_VALUE = _REPLACE_VALUE, + abs_path = abs_path, + ) + +def replace_absolute_paths(dir_, abs_path): + return "##replace_in_files## {dir_} {abs_path} {REPLACE_VALUE}".format( + dir_ = dir_, + REPLACE_VALUE = _REPLACE_VALUE, + abs_path = abs_path, + ) diff --git a/tools/build_defs/shell_toolchain/toolchains/toolchain_mappings.bzl b/tools/build_defs/shell_toolchain/toolchains/toolchain_mappings.bzl index 1691ddea0..bfce41a63 100644 --- a/tools/build_defs/shell_toolchain/toolchains/toolchain_mappings.bzl +++ b/tools/build_defs/shell_toolchain/toolchains/toolchain_mappings.bzl @@ -29,6 +29,12 @@ TOOLCHAIN_MAPPINGS = [ ], file = "@rules_foreign_cc//tools/build_defs/shell_toolchain/toolchains/impl:osx_commands.bzl", ), + ToolchainMapping( + exec_compatible_with = [ + "@bazel_tools//platforms:freebsd", + ], + file = "@rules_foreign_cc//tools/build_defs/shell_toolchain/toolchains/impl:bsd_commands.bzl", + ), ToolchainMapping( file = "@rules_foreign_cc//tools/build_defs/shell_toolchain/toolchains/impl:default_commands.bzl", ), From da83edd9e1761e32d061192b71e2fdae3f53793e Mon Sep 17 00:00:00 2001 From: irengrig Date: Mon, 8 Jun 2020 19:31:57 +0200 Subject: [PATCH 2/2] Update FreeBSD shell toolchain ... according to recent general changes in #377. --- .../toolchains/impl/bsd_commands.bzl | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/tools/build_defs/shell_toolchain/toolchains/impl/bsd_commands.bzl b/tools/build_defs/shell_toolchain/toolchains/impl/bsd_commands.bzl index 708ba51c2..373d1e914 100644 --- a/tools/build_defs/shell_toolchain/toolchains/impl/bsd_commands.bzl +++ b/tools/build_defs/shell_toolchain/toolchains/impl/bsd_commands.bzl @@ -46,10 +46,10 @@ fi def define_function(name, text): lines = [] - lines += ["function " + name + "() {"] + lines.append("function " + name + "() {") for line_ in text.splitlines(): - lines += [" " + line_] - lines += ["}"] + lines.append(" " + line_) + lines.append("}") return "\n".join(lines) def replace_in_files(dir, from_, to_): @@ -67,16 +67,16 @@ def copy_dir_contents_to_dir(source, target): def symlink_contents_to_dir(source, target): text = """local target="$2" -mkdir -p $target -if [[ -f $1 ]]; then - ##symlink_to_dir## $1 $target - return 0 -fi - -if [[ -d $1 || -L $1 ]]; then - local children=$(find -H $1 -maxdepth 1 -mindepth 1) +mkdir -p "$target" +if [[ -f "$1" ]]; then + ##symlink_to_dir## "$1" "$target" +elif [[ -L "$1" ]]; then + local actual=$(readlink "$1") + ##symlink_contents_to_dir## "$actual" "$target" +elif [[ -d "$1" ]]; then + local children=$(find -H "$1" -maxdepth 1 -mindepth 1) for child in $children; do - ##symlink_to_dir## $child $target + ##symlink_to_dir## "$child" "$target" done fi """ @@ -84,14 +84,18 @@ fi def symlink_to_dir(source, target): text = """local target="$2" -mkdir -p ${target} - -if [[ -d $1 ]]; then - gln -s -t ${target} $1 -elif [[ -f $1 ]]; then - gln -s -t ${target} $1 -elif [[ -L $1 ]]; then - gcp --no-target-directory $1 ${target} +mkdir -p "$target" +if [[ -f "$1" ]]; then + gln -s -t "$target" "$1" +elif [[ -L "$1" ]]; then + gcp $1 $2 +elif [[ -d "$1" ]]; then + local children=$(find -H "$1" -maxdepth 1 -mindepth 1) + local dirname=$(basename "$1") + mkdir -p "$target/$dirname" + for child in $children; do + ##symlink_to_dir## "$child" "$target/$dirname" + done else echo "Can not copy $1" fi