Skip to content
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

Fix macOS CI #1251

Merged
merged 6 commits into from
Aug 8, 2024
Merged

Fix macOS CI #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
598a17e
Turn off glib build on macOS
jsharpe Aug 7, 2024
2300560
Attempt to fix apr build
jsharpe Aug 7, 2024
8898987
Upgrade apr to 1.7.4
jsharpe Aug 7, 2024
0b7d7ac
Update apr_repositories.bzl
jsharpe Aug 7, 2024
eac0bd9
Update bison
jsharpe Aug 7, 2024
62d0c23
Disable mesa build
jsharpe Aug 8, 2024
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
6 changes: 4 additions & 2 deletions examples/third_party/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ test_suite(
"//cares:test_c_ares",
"//cares:test_c_ares_ios",
"//curl:curl_test_suite",
"//glib:glib_build_test",
# Fails due to linker error in ffi (https://github.com/mesonbuild/meson/issues/12282)
# "//glib:glib_build_test",
"//gn:gn_launch_test",
"//gperftools:test",
"//iconv:iconv_macos_build_test",
Expand All @@ -95,7 +96,8 @@ test_suite(
"//libpng:test_libpng",
"//libssh2:libssh2_build_test",
"//log4cxx:log4cxx_build_test",
"//mesa:mesa_build_test",
# Fails due to linker argument error (https://github.com/mesonbuild/meson/issues/12282)
# "//mesa:mesa_build_test",
"//openssl:openssl_test_suite",
"//pcre:pcre_build_test",
"//python:python_tests",
Expand Down
4 changes: 4 additions & 0 deletions examples/third_party/apr/BUILD.apr.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ configure_make(
configure_options = [
"--disable-shared",
],
configure_prefix = select({
"@platforms//os:macos": "CPPFLAGS=-DAPR_IOVEC_DEFINED ",
"//conditions:default": "",
}),
env = select({
"@platforms//os:macos": {"AR": ""},
"//conditions:default": {},
Expand Down
11 changes: 5 additions & 6 deletions examples/third_party/apr/apr_repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ def apr_repositories():
name = "apr",
build_file = Label("//apr:BUILD.apr.bazel"),
patches = [
# https://bz.apache.org/bugzilla/show_bug.cgi?id=50146
Label("//apr:macos_iovec.patch"),
# https://bz.apache.org/bugzilla/show_bug.cgi?id=64753
Label("//apr:macos_pid_t.patch"),
# https://apachelounge.com/viewtopic.php?t=8260
Label("//apr:windows_winnt.patch"),
],
sha256 = "48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2",
strip_prefix = "apr-1.7.0",
sha256 = "",
strip_prefix = "apr-1.7.4",
urls = [
"https://mirror.bazel.build/www-eu.apache.org/dist/apr/apr-1.7.0.tar.gz",
"https://www-eu.apache.org/dist/apr/apr-1.7.0.tar.gz",
"https://mirror.bazel.build/www-eu.apache.org/dist/apr/apr-1.7.4.tar.gz",
"https://dlcdn.apache.org/apr/apr-1.7.4.tar.gz",
"https://www-eu.apache.org/dist/apr/apr-1.7.4.tar.gz",
],
)
97 changes: 0 additions & 97 deletions examples/third_party/apr/macos_iovec.patch
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions examples/third_party/bison/bison_repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ def bison_repositories():
http_archive,
name = "bison",
build_file = Label("//bison:BUILD.bison.bazel"),
strip_prefix = "bison-3.3",
strip_prefix = "bison-3.8.2",
urls = [
"https://mirror.bazel.build/ftp.gnu.org/gnu/bison/bison-3.3.tar.gz",
"http://ftp.gnu.org/gnu/bison/bison-3.3.tar.gz",
"https://mirror.bazel.build/ftp.gnu.org/gnu/bison/bison-3.8.2.tar.gz",
"https://ftp.gnu.org/gnu/bison/bison-3.8.2.tar.gz",
],
sha256 = "fdeafb7fffade05604a61e66b8c040af4b2b5cbb1021dcfe498ed657ac970efd",
sha256 = "",
)