提交 f3c3093b 编写于 作者: T Tom Meyer 提交者: Larry Hamel

Update python version to 2.7.12

- Compile python 2.7.12 on centos6
- Update ext tarball on ivy to remove python 2.6.2
- Update ivy dependencies for python to point to 2.7.12
Signed-off-by: NTushar Dadlani <tdadlani@pivotal.io>
Signed-off-by: NTom Meyer <tmeyer@pivotal.io>
上级 83d0c53e
......@@ -42,6 +42,6 @@ workaround_before_concourse_stops_stripping_suid_bits() {
}
function run_test() {
ln -s "$(pwd)/gpdb_src/gpAux/ext/rhel6_x86_64/python-2.6.2" /opt
ln -s "$(pwd)/gpdb_src/gpAux/ext/rhel6_x86_64/python-2.7.12" /opt
su - gpadmin -c "bash /opt/run_test.sh $(pwd)"
}
......@@ -38,12 +38,12 @@ function prep_env_for_centos() {
;;
esac
ln -sf /$(pwd)/gpdb_src/gpAux/ext/${BLDARCH}/python-2.6.2 /opt/python-2.6.2
ln -sf /$(pwd)/gpdb_src/gpAux/ext/${BLDARCH}/python-2.7.12 /opt/python-2.7.12
export PATH=${JAVA_HOME}/bin:${PATH}
}
function prep_env_for_sles() {
ln -sf "$(pwd)/gpdb_src/gpAux/ext/sles11_x86_64/python-2.6.2" /opt
ln -sf "$(pwd)/gpdb_src/gpAux/ext/sles11_x86_64/python-2.7.12" /opt
export JAVA_HOME=/usr/lib64/jvm/java-1.6.0-openjdk-1.6.0
export PATH=${JAVA_HOME}/bin:${PATH}
source /opt/gcc_env.sh
......
......@@ -15,7 +15,7 @@ function prep_env_for_centos() {
ln -sf /usr/bin/xsubpp /usr/share/perl5/ExtUtils/xsubpp
source /opt/gcc_env.sh
ln -sf "$BASE_DIR"/gpdb_src/gpAux/ext/${BLDARCH}/python-2.6.2 /opt/python-2.6.2
ln -sf "$BASE_DIR"/gpdb_src/gpAux/ext/${BLDARCH}/python-2.7.12 /opt/python-2.7.12
export PATH=${JAVA_HOME}/bin:${PATH}
}
......
......@@ -68,7 +68,7 @@ then
# special for greenplum... python was built in /opt/, but resides in the ext directory
if test ! -d "${python_libdir}"
then
python_libdir=`echo "${python_configdir}" | sed "s/\/python2.6\/config//"`
python_libdir=`echo "${python_configdir}" | sed "s/\/python2.7\/config//"`
fi
python_libspec="-L${python_libdir} -l${ldlibrary}"
else
......
......@@ -8240,7 +8240,7 @@ then
# special for greenplum... python was built in /opt/, but resides in the ext directory
if test ! -d "${python_libdir}"
then
python_libdir=`echo "${python_configdir}" | sed "s/\/python2.6\/config//"`
python_libdir=`echo "${python_configdir}" | sed "s/\/python2.7\/config//"`
fi
python_libspec="-L${python_libdir} -l${ldlibrary}"
else
......
......@@ -82,17 +82,17 @@ export BLD_LD_LIBRARY_PATH_FIXED=true
aix5_ppc_32_PYTHONHOME=/opt/pware
aix5_ppc_64_PYTHONHOME=/opt/pware64
hpux_ia64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.5.6
osx106_x86_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.6.2
rhel5_x86_32_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.6.2
rhel5_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.6.2
rhel6_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.6.2
rhel7_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.6.2
sol10_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.6.2
osx106_x86_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
rhel5_x86_32_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
rhel5_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
rhel6_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
rhel7_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
sol10_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
sol10_x86_32_PYTHONHOME=/opt/python32-2.5.1
sol10_sparc_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.6.2
sol10_sparc_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
sol10_sparc_32_PYTHONHOME=/opt/python32-2.5.1
suse10_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.6.2
suse11_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.6.2
suse10_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
suse11_x86_64_PYTHONHOME=$(BLD_THIRDPARTY_DIR)/python-2.7.12
export PYTHONHOME=$($(BLD_ARCH)_PYTHONHOME)
PYTHON=$(PYTHONHOME)/bin/python
......
......@@ -22,7 +22,7 @@
<dependency org="gnu" name="libstdc" rev="6.0.22" conf="rhel7_x86_64->rhel6_x86_64;rhel6_x86_64->rhel6_x86_64;suse11_x86_64->suse11_x86_64;sol10_x86_64->sol10_x86_64" />
<dependency org="third-party" name="ext" rev="1.1" conf="win32->win32" />
<dependency org="third-party" name="ext" rev="2.0" conf="hpux_ia64->hpux_ia64;sol10_x86_32->sol10_x86_32;sol10_sparc_32->sol10_sparc_32;sol10_sparc_64->sol10_sparc_64;sol10_x86_64->sol10_x86_64" />
<dependency org="third-party" name="ext" rev="2.4" conf="rhel7_x86_64->rhel5_x86_64;rhel6_x86_64->rhel5_x86_64;suse11_x86_64->suse10_x86_64" />
<dependency org="third-party" name="ext" rev="2.5" conf="rhel7_x86_64->rhel6_x86_64;rhel6_x86_64->rhel6_x86_64;suse11_x86_64->suse10_x86_64" />
<dependency org="NetBackup" name="SDK-7.1" rev="7.1" conf="rhel7_x86_64->rhel5_x86_64;rhel6_x86_64->rhel5_x86_64" />
<dependency org="NetBackup" name="SDK-7.5" rev="7.5" conf="rhel7_x86_64->rhel5_x86_64;rhel6_x86_64->rhel5_x86_64" />
<dependency org="NetBackup" name="SDK-7.6" rev="7.6" conf="rhel7_x86_64->rhel5_x86_64;rhel6_x86_64->rhel5_x86_64" />
......@@ -34,6 +34,7 @@
<dependency org="Pivotal" name="libhdfs3" rev="2.2.30" conf="osx106_x86->osx106_x86" />
<dependency org="PyYAML" name="yaml" rev="0.1.1" conf="osx106_x86->osx106_x86" />
<dependency org="Python" name="python" rev="2.6.2" conf="osx106_x86->osx106_x86" />
<dependency org="Python" name="python" rev="2.7.12" conf="rhel6_x86_64->rhel6_x86_64;rhel7_x86_64->rhel6_x86_64" />
<dependency org="apache" name="apr" rev="1.2.12" conf="osx106_x86->osx106_x86" />
<dependency org="apache" name="apr-util" rev="1.2.12" conf="osx106_x86->osx106_x86" />
<dependency org="bzip" name="bzip2" rev="1.0.6" conf="osx106_x86->osx106_x86" />
......
......@@ -3,7 +3,7 @@ PYLIB_SRC=$(GPMGMT_SRC)/bin/pythonSrc
PYLIB_SRC_EXT=$(PYLIB_SRC)/ext
PYTHONSRC_INSTALL=$(PYLIB_SRC_EXT)/install
BEHAVE_BIN=$(PYTHONSRC_INSTALL)/bin/behave
PYTHONSRC_INSTALL_SITE=$(PYLIB_SRC_EXT)/install/lib/python2.6/site-packages
PYTHONSRC_INSTALL_SITE=$(PYLIB_SRC_EXT)/install/lib/python2.7/site-packages
PYTHONSRC_INSTALL_PYTHON_PATH=$(PYTHONPATH):$(PYTHONSRC_INSTALL_SITE)
TAR?=$(shell which tar)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册