Skip to content

Commit

Permalink
orc: use upstream patch for macOS pthread_jit detection
Browse files Browse the repository at this point in the history
  • Loading branch information
lovell committed Feb 20, 2023
1 parent d2cfe0e commit d3adcca
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions build/lin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,8 @@ make install-strip
mkdir ${DEPS}/orc
$CURL https://gstreamer.freedesktop.org/data/src/orc/orc-${VERSION_ORC}.tar.xz | tar xJC ${DEPS}/orc --strip-components=1
cd ${DEPS}/orc
# Prevent detection of pthread_jit for macOS 10 deployment target
if [ "$PLATFORM" == "darwin-x64" ]; then
sed -i'.bak' "s/cc.has_function('pthread_jit_write_protect_np')/false/" meson.build
fi
# Fix detection of macOS pthread_jit
$CURL https://gitlab.freedesktop.org/gstreamer/orc/-/commit/4d0144a9cc4efa195ae3e7f6b99b2daa9ad47b54.patch | patch -p1
meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \
-Dorc-test=disabled -Dbenchmarks=disabled -Dexamples=disabled -Dgtk_doc=disabled -Dtests=disabled -Dtools=disabled
meson install -C _build --tag devel
Expand Down

2 comments on commit d3adcca

@kleisauke
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lovell
Copy link
Owner Author

@lovell lovell commented on d3adcca Feb 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good spot, thank you Kleis, added via commit 84c26c5

Please sign in to comment.