From 021b53f924c1b5d4d9cb5827b2d5ec7c2ed0e96a Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 5 Oct 2016 00:32:33 +0000
Subject: [PATCH 1/3] Stop specifying `--enable-unicode=ucs4` on OS X (#257)

---
 plugins/python-build/bin/python-build    |  4 +++-
 plugins/python-build/test/build.bats     | 21 +++++++++++++++++++--
 plugins/python-build/test/compiler.bats  | 11 ++++++++++-
 plugins/python-build/test/pyenv_ext.bats | 16 ++++++++++++++--
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index f7e89322..3d148096 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1934,7 +1934,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..466aebcf 100644
--- a/plugins/python-build/test/build.bats
+++ b/plugins/python-build/test/build.bats
@@ -223,7 +223,11 @@ OUT
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
+  # yyuu/pyenv#257
   stub uname '-s : echo Darwin'
+
+  stub uname '-s : echo Darwin'
+
   stub sysctl false
   stub_make_install
 
@@ -238,7 +242,7 @@ DEF
 
   assert_build_log <<OUT
 Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
-Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib --enable-unicode=ucs4
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install
 OUT
@@ -251,7 +255,11 @@ OUT
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
+  # yyuu/pyenv#257
   stub uname '-s : echo Darwin'
+
+  stub uname '-s : echo Darwin'
+
   stub sysctl '-n hw.ncpu : echo 4'
   stub_make_install
 
@@ -267,7 +275,7 @@ DEF
 
   assert_build_log <<OUT
 Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
-Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib --enable-unicode=ucs4
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 4
 make install
 OUT
@@ -283,6 +291,9 @@ OUT
   # yyuu/pyenv#222
   stub uname '-s : echo FreeBSD'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo FreeBSD'
+
   export -n MAKE_OPTS
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
@@ -361,6 +372,9 @@ OUT
   # yyuu/pyenv#222
   stub uname '-s : echo FreeBSD'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo FreeBSD'
+
   MAKE= install_fixture definitions/vanilla-python
   assert_success
 
@@ -377,6 +391,9 @@ OUT
   # yyuu/pyenv#222
   stub uname '-s : echo FreeBSD'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo FreeBSD'
+
   MAKE= install_fixture definitions/vanilla-python
   assert_success
 
diff --git a/plugins/python-build/test/compiler.bats b/plugins/python-build/test/compiler.bats
index ce5841ac..3b482838 100644
--- a/plugins/python-build/test/compiler.bats
+++ b/plugins/python-build/test/compiler.bats
@@ -12,6 +12,9 @@ export -n PYTHON_CONFIGURE_OPTS
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.9.5'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.9.5'
   stub gcc '--version : echo 4.2.1'
@@ -33,6 +36,9 @@ OUT
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
   stub gcc '--version : echo 4.2.1'
@@ -67,6 +73,9 @@ DEF
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
   stub cc 'false'
@@ -89,7 +98,7 @@ build_package_standard python
 DEF
   assert_success
   assert_output <<OUT
-./configure --prefix=$INSTALL_ROOT --libdir=${TMP}/install/lib --enable-unicode=ucs4
+./configure --prefix=$INSTALL_ROOT --libdir=${TMP}/install/lib
 CC=clang
 CFLAGS=no
 make -j 2
diff --git a/plugins/python-build/test/pyenv_ext.bats b/plugins/python-build/test/pyenv_ext.bats
index 37e87b35..bcda77c7 100644
--- a/plugins/python-build/test/pyenv_ext.bats
+++ b/plugins/python-build/test/pyenv_ext.bats
@@ -234,6 +234,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 <<OUT
@@ -242,7 +245,7 @@ verify_python python3.4
 OUT
   assert_success
   assert_output <<EOS
-PYTHON_CONFIGURE_OPTS_ARRAY=(--libdir=${TMP}/install/lib --enable-framework=${TMP}/install --enable-unicode=ucs4)
+PYTHON_CONFIGURE_OPTS_ARRAY=(--libdir=${TMP}/install/lib --enable-framework=${TMP}/install)
 EOS
 
   [ -L "${INSTALL_ROOT}/Python.framework/Versions/Current/bin/python" ]
@@ -250,6 +253,9 @@ EOS
 }
 
 @test "enable universalsdk" {
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
 
   PYTHON_CONFIGURE_OPTS="--enable-universalsdk" TMPDIR="$TMP" run_inline_definition <<OUT
@@ -257,7 +263,7 @@ echo "PYTHON_CONFIGURE_OPTS_ARRAY=(\${PYTHON_CONFIGURE_OPTS_ARRAY[@]})"
 OUT
   assert_success
   assert_output <<EOS
-PYTHON_CONFIGURE_OPTS_ARRAY=(--libdir=${TMP}/install/lib --enable-universalsdk=/ --with-universal-archs=intel --enable-unicode=ucs4)
+PYTHON_CONFIGURE_OPTS_ARRAY=(--libdir=${TMP}/install/lib --enable-universalsdk=/ --with-universal-archs=intel)
 EOS
 }
 
@@ -283,6 +289,9 @@ OUT
 }
 
 @test "default MACOSX_DEPLOYMENT_TARGET" {
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
 
@@ -294,6 +303,9 @@ OUT
 }
 
 @test "use custom MACOSX_DEPLOYMENT_TARGET if defined" {
+  # yyuu/pyenv#257
+  stub uname '-s : echo Darwin'
+
   stub uname '-s : echo Darwin'
 
   MACOSX_DEPLOYMENT_TARGET="10.4" TMPDIR="$TMP" run_inline_definition <<OUT

From 9f3f38d312d6cb97878571a3b4e74e714550bc3d Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 5 Oct 2016 00:45:21 +0000
Subject: [PATCH 2/3] Add `uname` stubs to avoid test failures on OS X (#257)

---
 plugins/python-build/test/build.bats     | 32 ++++++++++++++++++++++++
 plugins/python-build/test/pyenv_ext.bats | 12 +++++++++
 2 files changed, 44 insertions(+)

diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats
index 466aebcf..f0e3a1b8 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 <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
 DEF
@@ -199,6 +219,10 @@ OUT
   stub brew
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   export PYTHON_CONFIGURE_OPTS="CPPFLAGS=-I$readline_libdir/include LDFLAGS=-L$readline_libdir/lib"
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
@@ -317,6 +341,10 @@ OUT
 
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   export PYTHON_MAKE_INSTALL_OPTS="DOGE=\"such wow\""
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
@@ -412,6 +440,10 @@ CONF
   stub apply 'echo apply "$@" >> 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 <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
diff --git a/plugins/python-build/test/pyenv_ext.bats b/plugins/python-build/test/pyenv_ext.bats
index bcda77c7..823662c0 100644
--- a/plugins/python-build/test/pyenv_ext.bats
+++ b/plugins/python-build/test/pyenv_ext.bats
@@ -101,6 +101,10 @@ resolve_link() {
 
   echo | install_patch definitions/vanilla-python "Python-3.2.1/empty.patch"
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null
   assert_success
 
@@ -127,6 +131,10 @@ OUT
   echo "bar" | install_patch definitions/vanilla-python "Python-3.2.1/bar.patch"
   echo "baz" | install_patch definitions/vanilla-python "Python-3.2.1/baz.patch"
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null
   assert_success
 
@@ -152,6 +160,10 @@ OUT
     " : echo \"$MAKE \$@\" >> 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
 

From 35ecd398ac3f951a611255e090b6ab8e42894be3 Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Wed, 5 Oct 2016 10:06:03 +0900
Subject: [PATCH 3/3] Fix test failure on OS X

---
 plugins/python-build/test/build.bats | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats
index f0e3a1b8..42ca4b08 100644
--- a/plugins/python-build/test/build.bats
+++ b/plugins/python-build/test/build.bats
@@ -366,6 +366,10 @@ OUT
 
   stub_make_install
 
+  # yyuu/pyenv#257
+  stub uname '-s : echo Linux'
+  stub uname '-s : echo Linux'
+
   export MAKE_INSTALL_OPTS="DOGE=\"such wow\""
   run_inline_definition <<DEF
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"