[Pkg-ceph-commits] [ceph] 11/23: d/p/pybind-flags.patch: Ensure that cython *FLAGS are correctly set.

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch jewel
in repository ceph.

commit b3e122f7a3b1a85c2860137a5bdc913edc43af51
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jan 26 10:34:55 2016 +0000

    d/p/pybind-flags.patch: Ensure that cython *FLAGS are correctly set.
---
 debian/patches/pybind-flags.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/pybind-flags.patch b/debian/patches/pybind-flags.patch
new file mode 100644
index 0000000..5392b0c
--- /dev/null
+++ b/debian/patches/pybind-flags.patch
@@ -0,0 +1,34 @@
+Description: Use python-config for cython flags
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+
+--- a/src/pybind/Makefile.am
++++ b/src/pybind/Makefile.am
+@@ -7,8 +7,8 @@ if WITH_CYTHON
+ 
+ PY_DISTUTILS = \
+ 	CPPFLAGS="-iquote \${abs_srcdir}/include ${AM_CPPFLAGS} ${CPPFLAGS}" \
+-	CFLAGS="-iquote \${abs_srcdir}/include ${AM_CFLAGS} ${CFLAGS}" \
+-	LDFLAGS="-L\${abs_builddir}/.libs $(subst -pie,,${AM_LDFLAGS}) ${LDFLAGS}" \
++	CFLAGS="-iquote \${abs_srcdir}/include ${AM_CFLAGS} ${PYTHON_CFLAGS} ${CFLAGS}" \
++	LDFLAGS="-L\${abs_builddir}/.libs $(subst -pie,,${AM_LDFLAGS}) ${PYTHON_LDFLAGS} ${LDFLAGS}" \
+ 	CYTHON_BUILD_DIR="$(shell readlink -f $(builddir))/build" \
+ 	${PYTHON} ./setup.py
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -213,6 +213,14 @@ if test x"$with_cython" = xyes; then
+     if test x"$CYTHON_CHECK" != xyes; then
+         AC_MSG_FAILURE([cython not found])
+     fi
++    AC_CHECK_PROG(PYTHON_CONFIG_CHECK, python-config, yes)
++    if test x"$PYTHON_CONFIG_CHECK" != xyes; then
++        AC_MSG_FAILURE([python-config not found])
++    fi
++    PYTHON_CFLAGS=`python-config --cflags`
++    AC_SUBST(PYTHON_CFLAGS)
++    PYTHON_LDFLAGS=`python-config --ldflags`
++    AC_SUBST(PYTHON_LDFLAGS)
+ fi
+ 
+ # cond-check if snappy-devel is installed, needed by leveldb that is need by server parts of the project
diff --git a/debian/patches/series b/debian/patches/series
index 057a594..c230ae0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ tests-disable.patch
 ceph-osd-prestart-path.patch
 fix-argparse-defaults.patch
 fix-cycles-arch.patch
+pybind-flags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git