Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/remove-osx-sysroot'

Browse source 
* origin/topic/timw/remove-osx-sysroot:
  Remove setting osx-sysroot on macOS CI builds
This commit is contained in:
Tim Wojtulewicz 2023-01-30 13:39:01 -07:00
commit 903fbbc5d6
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
5.2.0-dev.571 | 2023-01-30 13:39:01 -0700
* Remove setting osx-sysroot on macOS CI builds (Tim Wojtulewicz, Corelight)
5.2.0-dev.569 | 2023-01-30 09:19:23 -0700 5.2.0-dev.569 | 2023-01-30 09:19:23 -0700
* Whitespace cleanup in 5.2 NEWS block (Tim Wojtulewicz, Corelight) * Whitespace cleanup in 5.2 NEWS block (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.2.0-dev.569 5.2.0-dev.571

2
ci/build.sh
View file

@ -9,8 +9,6 @@ set -x
# If we're on macOS, use --osx-sysroot to ensure we can find the SDKs from Xcode. This avoids # If we're on macOS, use --osx-sysroot to ensure we can find the SDKs from Xcode. This avoids
# some problems with Catalina specifically, but it doesn't break anything on Big Sur either. # some problems with Catalina specifically, but it doesn't break anything on Big Sur either.
if [[ "${CIRRUS_OS}" == "darwin" ]]; then if [[ "${CIRRUS_OS}" == "darwin" ]]; then
export ZEEK_CI_CONFIGURE_FLAGS="${ZEEK_CI_CONFIGURE_FLAGS} --osx-sysroot=$(xcrun --show-sdk-path)"
# Starting with Monterey & Xcode 13.1 we need to help it find OpenSSL # Starting with Monterey & Xcode 13.1 we need to help it find OpenSSL
if [ -d /usr/local/opt/openssl@1.1/lib/pkgconfig ]; then if [ -d /usr/local/opt/openssl@1.1/lib/pkgconfig ]; then
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/openssl@1.1/lib/pkgconfig export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/openssl@1.1/lib/pkgconfig