Changeset: ec488a0bc4d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec488a0bc4d0
Modified Files:
MonetDB.spec
buildtools/doc/windowsbuild.rst
configure.ag
debian/fix-deb.sh
debian/rules
Branch: default
Log Message:
Renamed --enable-pyintegration configure option to --enable-py2integration.
Note the "2".
diffs (204 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -83,7 +83,7 @@
# On Fedora and RHEL 7, create the MonetDB-python2 package.
# On RHEL 6, numpy is too old.
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-%bcond_without pyintegration
+%bcond_without py2integration
%endif
%if %{fedpkgs}
@@ -151,7 +151,7 @@ BuildRequires: pkgconfig(zlib)
%if %{with samtools}
BuildRequires: samtools-devel
%endif
-%if %{with pyintegration}
+%if %{with py2integration}
BuildRequires: python-devel
%if %{?rhel:1}%{!?rhel:0}
# RedHat Enterprise Linux calls it simply numpy
@@ -508,7 +508,7 @@ install it.
%{_libdir}/monetdb5/lib_rapi.so
%endif
-%if %{with pyintegration}
+%if %{with py2integration}
%package python2
Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
Group: Applications/Databases
@@ -609,7 +609,7 @@ exit 0
%if %{with lidar}
%exclude %{_libdir}/monetdb5/lidar.mal
%endif
-%if %{with pyintegration}
+%if %{with py2integration}
%exclude %{_libdir}/monetdb5/pyapi.mal
%endif
%if %{with rintegration}
@@ -627,7 +627,7 @@ exit 0
%if %{with lidar}
%exclude %{_libdir}/monetdb5/autoload/*_lidar.mal
%endif
-%if %{with pyintegration}
+%if %{with py2integration}
%exclude %{_libdir}/monetdb5/autoload/*_pyapi.mal
%endif
%if %{with rintegration}
@@ -920,8 +920,8 @@ fi
--enable-netcdf=no \
--enable-odbc=yes \
--enable-optimize=no \
+
--enable-py2integration=%{?with_py2integration:yes}%{!?with_py2integration:no} \
--enable-py3integration=no \
-
--enable-pyintegration=%{?with_pyintegration:yes}%{!?with_pyintegration:no} \
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
--enable-sanitizer=no \
--enable-shp=no \
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -183,7 +183,7 @@ compiler uses to determine which files t
downloaded from http://www.python.org/. Just download and install the
Windows binary distribution.
-.. Say something about pyintegration.
+.. Say something about py2integration.
Note that you can use either or both Python2 and Python3, and on 64
bit architectures, either the 32 bit or 64 bit version of Python. All
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -285,12 +285,12 @@ AC_ARG_ENABLE([rintegration],
[enable_rintegration=$enableval],
[enable_rintegration=$dft_rintegration])
-dft_pyintegration=auto
-AC_ARG_ENABLE([pyintegration],
- [AS_HELP_STRING([--enable-pyintegration],
+dft_py2integration=auto
+AC_ARG_ENABLE([py2integration],
+ [AS_HELP_STRING([--enable-py2integration],
[enable support for Python 2 integration into MonetDB
(default=auto)])],
- [enable_pyintegration=$enableval],
- [enable_pyintegration=$dft_pyintegration])
+ [enable_py2integration=$enableval],
+ [enable_py2integration=$dft_py2integration])
dft_py3integration=auto
AC_ARG_ENABLE(py3integration,
@@ -1836,27 +1836,27 @@ AM_CONDITIONAL([HAVE_LIBR], [test x"$hav
# Python API (Python UDFs)
have_libpy=no
-AS_VAR_IF([enable_pyintegration], [no], [], [
- AS_CASE([$enable_pyintegration],
+AS_VAR_IF([enable_py2integration], [no], [], [
+ AS_CASE([$enable_py2integration],
[yes|auto], [XPATH="$PATH"],
- [/*], [XPATH="$enable_pyintegration"
- enable_pyintegration=yes],
- [AC_MSG_ERROR([--enable-pyintegration value must be
yes|no|auto|absolute path of python-config])])
+ [/*], [XPATH="$enable_py2integration"
+ enable_py2integration=yes],
+ [AC_MSG_ERROR([--enable-py2integration value must be
yes|no|auto|absolute path of python-config])])
AS_VAR_IF([have_py2config], [], [
AC_PATH_PROG([PY2CONFIG], [python2-config], [no], [$PATH])
AS_VAR_IF([PY2CONFIG], [no], [
AC_PATH_PROG([PYCMD2], [python-config], [no], [$PATH])
AS_VAR_IF([PYCMD2], [no], [
- AS_VAR_IF([enable_pyintegration], [yes],
+ AS_VAR_IF([enable_py2integration], [yes],
[AC_MSG_ERROR([python2-config library
required for Python integration support])],
[have_libpy=no
why_not_libpy="(python2-config command
not found)"
- enable_pyintegration=no
- why_not_pyintegration="(python2-config
command not found)"])
+ enable_py2integration=no
+
why_not_py2integration="(python2-config command not found)"])
], [PY2CONFIG="$PYCMD2"])
], [])
], [PY2CONFIG="$have_py2config"])
- AS_VAR_IF([enable_pyintegration], [no], [], [
+ AS_VAR_IF([enable_py2integration], [no], [], [
PYTHON_CMD=$PYTHON2
NUMPYVER=`$PYTHON_CMD -c "import numpy;
print(int(numpy.__version__.split('.').__getitem__(1)) >= 7)" 2> /dev/null`
# check numpyconfig.h because autoconf tests includes by
@@ -1866,19 +1866,19 @@ AS_VAR_IF([enable_pyintegration], [no],
[NUMPYHEADERS=True],
[NUMPYHEADERS=`$PYTHON_CMD -c "import numpy, os;
print(os.path.isfile(os.path.join(numpy.get_include(),
'numpy/arrayobject.h')))" 2> /dev/null`])
AS_IF([test "x$NUMPYVER" = x -o "x$NUMPYVER" = xFalse],
- [AS_VAR_IF([enable_pyintegration], [yes],
+ [AS_VAR_IF([enable_py2integration], [yes],
[AC_MSG_ERROR([numpy version >= 1.7.0 required
for Python integration support])],
[have_libpy=no
why_not_libpy="(numpy version >= 1.7.0 not
found)"
- enable_pyintegration=no
- why_not_pyintegration="(numpy version >= 1.7.0
not found)"])],
+ enable_py2integration=no
+ why_not_py2integration="(numpy version >=
1.7.0 not found)"])],
[test "x$NUMPYHEADERS" = xFalse ],
- [AS_VAR_IF([enable_pyintegration], [yes],
+ [AS_VAR_IF([enable_py2integration], [yes],
[AC_MSG_ERROR([numpy/arrayobject.h not found])],
[have_libpy=no
why_not_libpy="(numpy/arrayobject.h not found)"
- enable_pyintegration=no
- why_not_pyintegration="(numpy/arrayobject.h
not found)"])],
+ enable_py2integration=no
+ why_not_py2integration="(numpy/arrayobject.h
not found)"])],
[libpy_CFLAGS=`$PYTHON_CMD -c "from distutils.sysconfig
import get_python_inc; import numpy; print(' -I' + get_python_inc() + ' -I' +
numpy.get_include());" 2> /dev/null`
libpy_LIBS=`$PY2CONFIG --ldflags`
HAVEPYTHONHEADER=`$PYTHON_CMD -c "import
distutils.sysconfig, os;
print(os.path.isfile(os.path.join(distutils.sysconfig.get_python_inc(),
'Python.h')))" 2> /dev/null`
@@ -1887,12 +1887,12 @@ AS_VAR_IF([enable_pyintegration], [no],
AC_DEFINE([HAVE_LIBPY], 1, [Define if we can
link to python])
AC_SUBST([libpy_CFLAGS], [$libpy_CFLAGS])
AC_SUBST([libpy_LIBS], [$libpy_LIBS])],
- [AS_VAR_IF([enable_pyintegration], [yes],
+ [AS_VAR_IF([enable_py2integration], [yes],
[AC_MSG_ERROR([Python.h not found])],
[have_libpy=no
why_not_libpy="Python.h not found"
- enable_pyintegration=no
- why_not_pyintegration="Python.h not
found"])])])])])
+ enable_py2integration=no
+ why_not_py2integration="Python.h not
found"])])])])])
AM_CONDITIONAL([HAVE_LIBPY], [test x"$have_libpy" != xno])
@@ -2937,7 +2937,7 @@ for comp in \
'sql ' \
'geom ' \
'console ' \
- 'pyintegration ' \
+ 'py2integration' \
'py3integration' \
'rintegration ' \
'odbc ' \
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -60,7 +60,7 @@ wheezy)
# numpy is too old
sed -i -e 's/, python-dev[^,]*//;s/, python-numpy[^,]*//' \
-e '/^Package:.*monetdb-python2/,/^$/d' debian/control
- sed -i '/pyintegration=yes/s/yes/no/' debian/rules
+ sed -i '/py2integration=yes/s/yes/no/' debian/rules
rm debian/monetdb-python2.install
;;
trusty)
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,8 @@ override_dh_auto_configure:
--enable-netcdf=no \
--enable-odbc=yes \
--enable-optimize=yes \
+ --enable-py2integration=yes \
--enable-py3integration=no \
- --enable-pyintegration=yes \
--enable-rintegration=yes \
--enable-sanitizer=no \
--enable-shp=no \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
