From 10fbae681e072dd6359bf7a8c56e93c541c83b0b Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 14 May 2013 16:07:03 -0400 Subject: configure.ac: build glupy with installed python IOW with more than just python2.6. Python2.7 is certainly what's on the vast majority of non-RHEL systems that are out there. Also our rpm.t regression test will build on epel-5 under mock; RHEL5 has Python2.4. Change-Id: I09c95c1fb6b3498e910ad239c4f0af7f786c3700 BUG: 961856 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: http://review.gluster.org/5007 Reviewed-by: Jeff Darcy Tested-by: Gluster Build System --- xlators/features/glupy/src/Makefile.am | 4 ++-- xlators/features/glupy/src/glupy.c | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'xlators/features/glupy') diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am index 931e5b741cb..9608628398f 100644 --- a/xlators/features/glupy/src/Makefile.am +++ b/xlators/features/glupy/src/Makefile.am @@ -9,11 +9,11 @@ glupy_PYTHON = gluster.py negative.py helloworld.py debug-trace.py glupy_la_LDFLAGS = -module -avoid-version -shared -nostartfiles glupy_la_SOURCES = glupy.c glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - -lpthread -lpython2.6 + -lpthread -l$(BUILD_PYTHON_LIB) noinst_HEADERS = glupy.h -AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src +AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -isystem $(BUILD_PYTHON_INC) AM_CFLAGS = -Wall -fno-strict-aliasing -DGLUSTER_PYTHON_PATH=\"$(glupydir)\" $(GF_CFLAGS) diff --git a/xlators/features/glupy/src/glupy.c b/xlators/features/glupy/src/glupy.c index fafea817cdb..dc86c0071e1 100644 --- a/xlators/features/glupy/src/glupy.c +++ b/xlators/features/glupy/src/glupy.c @@ -19,7 +19,7 @@ #include #include -#include +#include #ifndef _CONFIG_H #define _CONFIG_H @@ -2424,19 +2424,10 @@ err_return: void fini (xlator_t *this) { - int i = 0; glupy_private_t *priv = this->private; if (!priv) return; - for (i = 0; i < GLUPY_N_FUNCS; ++i) { - if (priv->fops[i]) { - Py_DECREF(priv->fops[i]); - } - if (priv->cbks[i]) { - Py_DECREF(priv->fops[i]); - } - } Py_DECREF(priv->py_xlator); Py_DECREF(priv->py_module); this->private = NULL; -- cgit