From bc8dba4beabfa680b5ecc82b4bec3fa51f489c08 Mon Sep 17 00:00:00 2001 From: "Yamashita, Yuu" Date: Wed, 3 Aug 2016 10:48:44 +0900 Subject: [PATCH] Always create `bin` as symlink to framework path if the version was built with `--enable-frameowrk` (#590) Actually I'm not 100% sure what was going on, but it seems CPython build script may create `bin` as directory instead of symlink even if `--enable-framework` was specified. --- plugins/python-build/bin/python-build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 527b1884..779a0a5a 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1467,7 +1467,11 @@ apply_python_patch() { } build_package_symlink_version_suffix() { - if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]] && [ ! -e "${PREFIX_PATH}/bin" ]; then + if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then + if [ -e "${PREFIX_PATH}/bin" ]; then + # Always create `bin` as symlink to framework path if the version was built with `--enable-frameowrk` (#590) + mv -f "${PREFIX_PATH}/bin" "${PREFIX_PATH}/bin.orig" + fi # Only symlinks are installed in ${PREFIX_PATH}/bin ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/bin" "${PREFIX_PATH}/bin" fi