From 2b9c7a95e80dab3014bebf88533c2779b9d1d710 Mon Sep 17 00:00:00 2001 From: Jaeho Shin Date: Sat, 7 Jan 2017 20:58:06 -0800 Subject: [PATCH] Fixes python-lib to build with system python --- extern/bundled/python-lib/install.sh | 6 ++++-- util/install/install.Ubuntu.sh | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) mode change 100755 => 100644 extern/bundled/python-lib/install.sh diff --git a/extern/bundled/python-lib/install.sh b/extern/bundled/python-lib/install.sh old mode 100755 new mode 100644 index d86f65e0b..67bce06ee --- a/extern/bundled/python-lib/install.sh +++ b/extern/bundled/python-lib/install.sh @@ -7,8 +7,10 @@ unset PYTHONPATH # existing PYTHONPATH can interfere fetch-verify get-pip.py https://bootstrap.pypa.io/get-pip.py for python in python2.7 python3.{6,5,4}; do type $python || continue - PYTHONPATH="$PWD"/prefix/lib/$python/site-packages \ - $python get-pip.py setuptools -r requirements.txt --upgrade --ignore-installed --prefix prefix + ( export PYTHONPATH="$PWD"/prefix/lib/$python/site-packages + $python get-pip.py --upgrade --force-reinstall --ignore-installed --prefix prefix setuptools + $python get-pip.py --upgrade --force-reinstall --ignore-installed --prefix prefix -r requirements.txt + ) done # remove pip and setuptools diff --git a/util/install/install.Ubuntu.sh b/util/install/install.Ubuntu.sh index 54c271d39..c5e768eaf 100644 --- a/util/install/install.Ubuntu.sh +++ b/util/install/install.Ubuntu.sh @@ -61,6 +61,7 @@ install__deepdive_build_deps() { # psycopg2 libreadline-dev python-dev + python3-dev libpq-dev # graphviz-devel autoconf pkg-config libtool