[vlc-commits] macOS build.sh: Detect local installation of python3
David Fuhrmann
git at videolan.org
Sat Dec 29 23:44:22 CET 2018
vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Dec 29 18:55:28 2018 +0100| [5842f62b4475fdd15d3f5279dec20f4c2940d1ce] | committer: David Fuhrmann
macOS build.sh: Detect local installation of python3
Since python3 is now mandatory for meson and co, try to detect
a packaged install and add it to the path.
Note that /usr/local/bin is not added completely, to avoid
interference with homebrew.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5842f62b4475fdd15d3f5279dec20f4c2940d1ce
---
extras/package/macosx/env.build.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/extras/package/macosx/env.build.sh b/extras/package/macosx/env.build.sh
index 76910e86e8..5e2d29c3d6 100755
--- a/extras/package/macosx/env.build.sh
+++ b/extras/package/macosx/env.build.sh
@@ -39,7 +39,13 @@ vlcSetBaseEnvironment() {
export CXX="$(xcrun --find clang++)"
export OBJC="$(xcrun --find clang)"
export OBJCXX="$(xcrun --find clang++)"
- export PATH="${VLC_ROOT_DIR}/extras/tools/build/bin:${VLC_ROOT_DIR}/contrib/${LOCAL_TRIPLET}/bin:${VLC_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
+
+ python3Path=$(echo /Library/Frameworks/Python.framework/Versions/3.*/bin | awk '{print $1;}')
+ if [ ! -d "$python3Path" ]; then
+ python3Path=""
+ fi
+
+ export PATH="${VLC_ROOT_DIR}/extras/tools/build/bin:${VLC_ROOT_DIR}/contrib/${LOCAL_TRIPLET}/bin:$python3Path:${VLC_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
}
vlcSetSymbolEnvironment() {
More information about the vlc-commits
mailing list