-
Notifications
You must be signed in to change notification settings - Fork 752
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BROKEN entries removed for now, feel free to report or re-add Event: Kitchener-Waterloo Hackathon 202305
- Loading branch information
Showing
13 changed files
with
214 additions
and
109 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1660993625 | ||
| SHA256 (bazel-5.3.0rc2-dist.zip) = cf9435792305bd5237107c8687a9d1b5ccaaf231323b35247aef4534815dc22f | ||
| SIZE (bazel-5.3.0rc2-dist.zip) = 235287050 | ||
| TIMESTAMP = 1684957266 | ||
| SHA256 (bazel-6.2.0-dist.zip) = f1e8f788637ac574d471d619d2096baaca04a19b57a034399e079633db441945 | ||
| SIZE (bazel-6.2.0-dist.zip) = 196992916 |
This file was deleted.
Oops, something went wrong.
140 changes: 140 additions & 0 deletions
140
devel/bazel/files/extra-patch-abseil-cpp-cfe27e79cfcbefb2b4479e04f80cbb299bc46965
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 |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| From 1a6044c0ec33ea394c1258ae4e934f1fef3a710f Mon Sep 17 00:00:00 2001 | ||
| From: Abseil Team <[email protected]> | ||
| Date: Fri, 5 Aug 2022 06:56:05 -0700 | ||
| Subject: [PATCH] Map the absl::is_trivially_* functions to their std impl | ||
|
|
||
| There's no point redefining these functions if they are supported by the compiler and the version of libstdc++. Also, some of the builtins used by the absl implementation of these functions (e.g. __has_trivial_destructor) have been deprecated in Clang 15. | ||
|
|
||
| PiperOrigin-RevId: 465554125 | ||
| Change-Id: I8674c3a5270ce3c654cdf58ae7dbd9d2bda8faa5 | ||
| --- | ||
| absl/base/config.h | 18 ++++++++---------- | ||
| absl/meta/type_traits.h | 22 ++++++++++++++++++++++ | ||
| absl/meta/type_traits_test.cc | 1 + | ||
| 3 files changed, 31 insertions(+), 10 deletions(-) | ||
|
|
||
| diff --git absl/base/config.h absl/base/config.h | ||
| index 585485c3..ab5791a5 100644 | ||
| --- absl/base/config.h | ||
| +++ absl/base/config.h | ||
| @@ -259,17 +259,15 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || | ||
| #define ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE 1 | ||
| #endif | ||
|
|
||
| -// ABSL_HAVE_SOURCE_LOCATION_CURRENT | ||
| +// ABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE | ||
| // | ||
| -// Indicates whether `absl::SourceLocation::current()` will return useful | ||
| -// information in some contexts. | ||
| -#ifndef ABSL_HAVE_SOURCE_LOCATION_CURRENT | ||
| -#if ABSL_INTERNAL_HAS_KEYWORD(__builtin_LINE) && \ | ||
| - ABSL_INTERNAL_HAS_KEYWORD(__builtin_FILE) | ||
| -#define ABSL_HAVE_SOURCE_LOCATION_CURRENT 1 | ||
| -#elif ABSL_INTERNAL_HAVE_MIN_GNUC_VERSION(5, 0) | ||
| -#define ABSL_HAVE_SOURCE_LOCATION_CURRENT 1 | ||
| -#endif | ||
| +// Checks whether `std::is_trivially_copyable<T>` is supported. | ||
| +// | ||
| +// Notes: Clang 15+ with libc++ supports these features, GCC hasn't been tested. | ||
| +#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE) | ||
| +#error ABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE cannot be directly set | ||
| +#elif defined(__clang__) && (__clang_major__ >= 15) | ||
| +#define ABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE 1 | ||
| #endif | ||
|
|
||
| // ABSL_HAVE_THREAD_LOCAL | ||
| diff --git absl/meta/type_traits.h absl/meta/type_traits.h | ||
| index d886cb30..46b76906 100644 | ||
| --- absl/meta/type_traits.h | ||
| +++ absl/meta/type_traits.h | ||
| @@ -298,8 +298,12 @@ struct is_function | ||
| // https://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html#Type-Traits. | ||
| template <typename T> | ||
| struct is_trivially_destructible | ||
| +#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE | ||
| + : std::is_trivially_destructible<T> { | ||
| +#else | ||
| : std::integral_constant<bool, __has_trivial_destructor(T) && | ||
| std::is_destructible<T>::value> { | ||
| +#endif | ||
| #ifdef ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE | ||
| private: | ||
| static constexpr bool compliant = std::is_trivially_destructible<T>::value == | ||
| @@ -347,9 +351,13 @@ struct is_trivially_destructible | ||
| // Nontrivially destructible types will cause the expression to be nontrivial. | ||
| template <typename T> | ||
| struct is_trivially_default_constructible | ||
| +#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) | ||
| + : std::is_trivially_default_constructible<T> { | ||
| +#else | ||
| : std::integral_constant<bool, __has_trivial_constructor(T) && | ||
| std::is_default_constructible<T>::value && | ||
| is_trivially_destructible<T>::value> { | ||
| +#endif | ||
| #if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \ | ||
| !defined( \ | ||
| ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION) | ||
| @@ -381,10 +389,14 @@ struct is_trivially_default_constructible | ||
| // expression to be nontrivial. | ||
| template <typename T> | ||
| struct is_trivially_move_constructible | ||
| +#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) | ||
| + : std::is_trivially_move_constructible<T> { | ||
| +#else | ||
| : std::conditional< | ||
| std::is_object<T>::value && !std::is_array<T>::value, | ||
| type_traits_internal::IsTriviallyMoveConstructibleObject<T>, | ||
| std::is_reference<T>>::type::type { | ||
| +#endif | ||
| #if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \ | ||
| !defined( \ | ||
| ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION) | ||
| @@ -490,9 +502,13 @@ struct is_trivially_move_assignable | ||
| // `is_trivially_assignable<T&, const T&>`. | ||
| template <typename T> | ||
| struct is_trivially_copy_assignable | ||
| +#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE | ||
| + : std::is_trivially_copy_assignable<T> { | ||
| +#else | ||
| : std::integral_constant< | ||
| bool, __has_trivial_assign(typename std::remove_reference<T>::type) && | ||
| absl::is_copy_assignable<T>::value> { | ||
| +#endif | ||
| #ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE | ||
| private: | ||
| static constexpr bool compliant = | ||
| @@ -544,6 +560,11 @@ namespace type_traits_internal { | ||
| // destructible. Arrays of trivially copyable types are trivially copyable. | ||
| // | ||
| // We expose this metafunction only for internal use within absl. | ||
| + | ||
| +#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE) | ||
| +template <typename T> | ||
| +struct is_trivially_copyable : std::is_trivially_copyable<T> {}; | ||
| +#else | ||
| template <typename T> | ||
| class is_trivially_copyable_impl { | ||
| using ExtentsRemoved = typename std::remove_all_extents<T>::type; | ||
| @@ -569,6 +590,7 @@ template <typename T> | ||
| struct is_trivially_copyable | ||
| : std::integral_constant< | ||
| bool, type_traits_internal::is_trivially_copyable_impl<T>::kValue> {}; | ||
| +#endif | ||
| } // namespace type_traits_internal | ||
|
|
||
| // ----------------------------------------------------------------------------- | ||
| diff --git absl/meta/type_traits_test.cc absl/meta/type_traits_test.cc | ||
| index 0ef5b665..fe96554d 100644 | ||
| --- absl/meta/type_traits_test.cc | ||
| +++ absl/meta/type_traits_test.cc | ||
| @@ -336,6 +336,7 @@ struct MovableNonCopyable { | ||
|
|
||
| struct NonCopyableOrMovable { | ||
| NonCopyableOrMovable() = default; | ||
| + virtual ~NonCopyableOrMovable() = default; | ||
| NonCopyableOrMovable(const NonCopyableOrMovable&) = delete; | ||
| NonCopyableOrMovable(NonCopyableOrMovable&&) = delete; | ||
| NonCopyableOrMovable& operator=(const NonCopyableOrMovable&) = delete; | ||
| -- | ||
| 2.40.1 | ||
|
|
2 changes: 1 addition & 1 deletion
2
...-absl_base_internal_unscaledcycleclock.cc → ..._absl_base_internal_unscaledcycleclock.cc
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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --- a/bazel/grpc_deps.bzl.orig 2022-06-21 20:39:47 UTC | ||
| +++ b/bazel/grpc_deps.bzl | ||
| @@ -295,6 +295,10 @@ def grpc_deps(): | ||
| http_archive( | ||
| name = "com_google_absl", | ||
| sha256 = "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", | ||
| + patches = [ | ||
| + "//third_party/grpc:extra-patch-abseil-cpp_absl_base_internal_unscaledcycleclock.cc", | ||
| + "//third_party/grpc:extra-patch-abseil-cpp-cfe27e79cfcbefb2b4479e04f80cbb299bc46965", | ||
| + ], | ||
| strip_prefix = "abseil-cpp-20211102.0", | ||
| urls = [ | ||
| "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz", | ||
| @@ -350,6 +354,7 @@ def grpc_deps(): | ||
| http_archive( | ||
| name = "upb", | ||
| sha256 = "d0fe259d650bf9547e75896a1307bfc7034195e4ae89f5139814d295991ba681", | ||
| + patches = ["//third_party/grpc:extra-patch-upb_bazel_build__defs.bzl"], | ||
| strip_prefix = "upb-bef53686ec702607971bd3ea4d4fefd80c6cc6e8", | ||
| urls = [ | ||
| "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/bef53686ec702607971bd3ea4d4fefd80c6cc6e8.tar.gz", |
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 |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- bazel/build_defs.bzl.orig 2022-06-21 20:39:47 UTC | ||
| +++ bazel/build_defs.bzl | ||
| @@ -36,6 +36,7 @@ _DEFAULT_CPPOPTS.extend([ | ||
| # "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang) | ||
| "-Werror", | ||
| "-Wno-long-long", | ||
| + "-Wno-deprecated-copy", | ||
| ]) | ||
| _DEFAULT_COPTS.extend([ | ||
| "-std=c99", |
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 |
|---|---|---|
| @@ -1,20 +1,21 @@ | ||
| --- distdir_deps.bzl.orig 1979-12-31 23:00:00 UTC | ||
| --- distdir_deps.bzl.orig 1980-01-01 05:00:00 UTC | ||
| +++ distdir_deps.bzl | ||
| @@ -130,6 +130,7 @@ DIST_DEPS = { | ||
| @@ -122,6 +122,7 @@ DIST_DEPS = { | ||
| "patch_args": ["-p1"], | ||
| "patches": [ | ||
| "//third_party/grpc:grpc_1.41.0.patch", | ||
| + "//third_party/grpc:extra-patch-bazel_grpc__deps.bzl", | ||
| "//third_party/grpc:grpc_1.41.0.win_arm64.patch", | ||
| "//third_party/grpc:grpc_1.47.0.patch", | ||
| + "//third_party/grpc:extra-patch-grpc_bazel_grpc__deps.bzl", | ||
| "//third_party/grpc:grpc_1.47.0.win_arm64.patch", | ||
| ], | ||
| "used_in": [ | ||
| @@ -168,6 +169,9 @@ DIST_DEPS = { | ||
| @@ -234,6 +235,10 @@ DIST_DEPS = { | ||
| "urls": [ | ||
| "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", | ||
| "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", | ||
| + ], | ||
| + "patches": [ | ||
| + "//third_party/py/abseil:extra-patch-abseil-cpp_absl_base_internal_unscaledcycleclock.cc", | ||
| + "//third_party/py/abseil:extra-patch-abseil-cpp-cfe27e79cfcbefb2b4479e04f80cbb299bc46965", | ||
| ], | ||
| + "patches": [ | ||
| + "//third_party/py/abseil:extra-patch-absl_base_internal_unscaledcycleclock.cc", | ||
| + ], | ||
| "used_in": [ | ||
| "additional_distfiles", | ||
| "test_WORKSPACE_files", |
8 changes: 4 additions & 4 deletions
8
...-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java
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
6 changes: 3 additions & 3 deletions
6
...src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt
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 |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| --- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig 2020-10-07 21:26:37 UTC | ||
| --- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig 1980-01-01 05:00:00 UTC | ||
| +++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt | ||
| @@ -58,7 +58,7 @@ if IsWindows() and not HasWindowsExecuta | ||
| @@ -76,7 +76,7 @@ def SearchPath(name): | ||
|
|
||
| def SearchPath(name): | ||
| """Finds a file in a given search path.""" | ||
| - search_path = os.getenv('PATH', os.defpath).split(os.pathsep) | ||
| + search_path = os.getenv('PATH', os.defpath + ':/usr/local/bin').split(os.pathsep) | ||
| + search_path = os.getenv('PATH', os.defpath + ':%%PREFIX%%/bin').split(os.pathsep) | ||
| for directory in search_path: | ||
| if directory: | ||
| path = os.path.join(directory, name) |
Oops, something went wrong.