diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 73a00e06..d7284c69 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1939,7 +1939,9 @@ fi # Compile with `--enable-unicode=ucs4` by default (#257) if [[ "$PYTHON_CONFIGURE_OPTS" != *"--enable-unicode="* ]]; then - package_option python configure --enable-unicode=ucs4 + if ! is_mac; then + package_option python configure --enable-unicode=ucs4 + fi fi # SSL Certificate error with older wget that does not support Server Name Indication (#60) diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats index 236a3d7c..42ca4b08 100644 --- a/plugins/python-build/test/build.bats +++ b/plugins/python-build/test/build.bats @@ -67,6 +67,10 @@ assert_build_log() { stub_make_install stub_make_install + # yyuu/pyenv#257 + stub uname '-s : echo Linux' + stub uname '-s : echo Linux' + install_fixture definitions/needs-yaml assert_success @@ -93,6 +97,10 @@ OUT stub_make_install stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log' + # yyuu/pyenv#257 + stub uname '-s : echo Linux' + stub uname '-s : echo Linux' + TMPDIR="$TMP" install_fixture --patch definitions/needs-yaml <<<"" assert_success @@ -121,6 +129,10 @@ OUT stub_make_install stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log' + # yyuu/pyenv#257 + stub uname '-s : echo Linux' + stub uname '-s : echo Linux' + TMPDIR="$TMP" install_fixture --patch definitions/needs-yaml <<<"diff --git a/script.py" assert_success @@ -149,6 +161,10 @@ OUT stub brew "--prefix libyaml : echo '$brew_libdir'" false stub_make_install + # yyuu/pyenv#257 + stub uname '-s : echo Linux' + stub uname '-s : echo Linux' + install_fixture definitions/needs-yaml assert_success @@ -172,6 +188,10 @@ OUT stub brew "--prefix readline : echo '$readline_libdir'" stub_make_install + # yyuu/pyenv#257 + stub uname '-s : echo Linux' + stub uname '-s : echo Linux' + run_inline_definition <> build.log' stub_make_install + # yyuu/pyenv#257 + stub uname '-s : echo Linux' + stub uname '-s : echo Linux' + export PYTHON_CONFIGURE="${TMP}/custom-configure" run_inline_definition <> build.log" \ " : echo \"$MAKE \$@\" >> build.log && cat build.log >> '$INSTALL_ROOT/build.log'" + # yyuu/pyenv#257 + stub uname '-s : echo Linux' + stub uname '-s : echo Linux' + PYTHON_MAKE_INSTALL_TARGET="altinstall" TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null assert_success @@ -234,6 +246,9 @@ OUT touch "${INSTALL_ROOT}/Python.framework/Versions/Current/bin/python3.4-config" chmod +x "${INSTALL_ROOT}/Python.framework/Versions/Current/bin/python3.4-config" + # yyuu/pyenv#257 + stub uname '-s : echo Darwin' + stub uname '-s : echo Darwin' PYTHON_CONFIGURE_OPTS="--enable-framework" TMPDIR="$TMP" run_inline_definition <