Repository: incubator-hawq Updated Branches: refs/heads/master e2ddb6ac0 -> 7db48c128
HAWQ-271. Fix 'hawq' issue for OSX after Python is removed. Fix following environment only for OSX: Remove ext/python/bin from PATH to avoid using the Python version from HAWQ. Remove the library path lib/python/pygresql from PYTHONPATH. Remove ext/python/lib from DYLD_LIBRARY_PATH. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/7db48c12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/7db48c12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/7db48c12 Branch: refs/heads/master Commit: 7db48c128806e076843778df8034d9a9a63e6391 Parents: e2ddb6a Author: Xin Zhang <[email protected]> Authored: Thu Jan 7 11:07:41 2016 -0800 Committer: Xin Zhang <[email protected]> Committed: Thu Jan 14 17:54:55 2016 -0800 ---------------------------------------------------------------------- tools/bin/generate-greenplum-path.sh | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7db48c12/tools/bin/generate-greenplum-path.sh ---------------------------------------------------------------------- diff --git a/tools/bin/generate-greenplum-path.sh b/tools/bin/generate-greenplum-path.sh index 3fcd2fb..11ffe5b 100755 --- a/tools/bin/generate-greenplum-path.sh +++ b/tools/bin/generate-greenplum-path.sh @@ -56,18 +56,18 @@ if [ -h \${GPHOME}/../hawq ]; then fi EOF -# OSX does not need JAVA_HOME +# OSX does NOT have DYLD_LIBRARY_PATH, add it if [ "${PLAT}" = "Darwin" ] ; then -cat << EOF -PATH=\$GPHOME/bin:\$GPHOME/ext/python/bin:\$PATH -DYLD_LIBRARY_PATH=\$GPHOME/lib:\$GPHOME/ext/python/lib:\$DYLD_LIBRARY_PATH +cat <<EOF +PATH=\$GPHOME/bin:\$PATH +DYLD_LIBRARY_PATH=\$GPHOME/lib:\$DYLD_LIBRARY_PATH EOF fi -# Solaris needs amd64 in PATH for java to work -if [ "${PLAT}" = "SunOS" ] ; then +# OSX does NOT need ext/python/bin/ path +if [ "${PLAT}" = "Darwin" ] ; then cat <<EOF -PATH=\$GPHOME/bin:\$GPHOME/ext/python/bin:\$PATH +PATH=\$GPHOME/bin:\$PATH EOF else cat <<EOF @@ -75,7 +75,7 @@ PATH=\$GPHOME/bin:\$GPHOME/ext/python/bin:\$PATH EOF fi -# OS X does not have LD_LIBRARY_PATH +# OSX does NOT have LD_LIBRARY_PATH, add it if [ "${PLAT}" != "Darwin" ] ; then #Solaris needs /usr/sfw/lib in order for groupsession to work and /usr/local/lib for readline for Python if [ "${PLAT}" = "SunOS" ] ; then @@ -90,9 +90,16 @@ EOF fi #setup PYTHONPATH +# OSX does NOT need pygresql/ path +if [ "${PLAT}" = "Darwin" ] ; then +cat <<EOF +PYTHONPATH=\$GPHOME/lib/python:\$PYTHONPATH +EOF +else cat <<EOF PYTHONPATH=\$GPHOME/lib/python:\$GPHOME/lib/python/pygresql:\$PYTHONPATH EOF +fi # openssl configuration file path cat <<EOF
