| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | Use python3 rather default python which maybe links to python2 for oe. And add |
| 2 | option for setup.py to install files to right directory. |
| 3 | |
| 4 | Upstream-Status: Inappropriate [OE specific] |
| 5 | |
| 6 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 7 | --- |
| 8 | diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in |
| 9 | index a43a3c1..2e727f2 100644 |
| 10 | --- a/bin/python/Makefile.in |
| 11 | +++ b/bin/python/Makefile.in |
| 12 | @@ -55,9 +55,9 @@ install:: ${TARGETS} installdirs |
| 13 | ${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8 |
| 14 | if test -n "${PYTHON}" ; then \ |
| 15 | if test -n "${DESTDIR}" ; then \ |
| 16 | - ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} ; \ |
| 17 | + ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} --install-lib=${PYTHON_SITEPACKAGES_DIR} ; \ |
| 18 | else \ |
| 19 | - ${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} ; \ |
| 20 | + ${PYTHON} ${srcdir}/setup.py install --prefix=${prefix} --install-lib=${PYTHON_SITEPACKAGES_DIR} ; \ |
| 21 | fi \ |
| 22 | fi |
| 23 | |
| 24 | diff --git a/configure.in b/configure.in |
| 25 | index 314bb90..867923e 100644 |
| 26 | --- a/configure.in |
| 27 | +++ b/configure.in |
| 28 | @@ -227,7 +227,7 @@ AC_ARG_WITH(python, |
| 29 | [ --with-python=PATH specify path to python interpreter], |
| 30 | use_python="$withval", use_python="unspec") |
| 31 | |
| 32 | -python="python python3 python3.5 python3.4 python3.3 python3.2 python2 python2.7" |
| 33 | +python="python3 python3.5 python3.4 python3.3 python3.2 python2 python2.7" |
| 34 | |
| 35 | testargparse='try: import argparse |
| 36 | except: exit(1)' |