summaryrefslogtreecommitdiffstats
path: root/xlators/features/glupy/src
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2015-05-07 12:39:05 +0200
committerVijay Bellur <vbellur@redhat.com>2015-05-07 12:05:25 -0700
commit317560cc5544f8ca8286ba5ecedd8236746e9ebf (patch)
tree32e9d228f6b13ffc3f320058be76110b10bda3d2 /xlators/features/glupy/src
parent865aa4ebdd71d39f8e8ae59b40d993edb4a62708 (diff)
glupy: fix tuntime search path and python module directory layout
1) The glupy.so xlator should embed the runtime search path for the python libraries. Unfortunately, python-config does not gives the appprioate flags, therefore we need to also use pkg-config to obtain them 2) Fix the glupy python module directory layout so that python can import the module without problem That two fixes seems to let glupy.t pass on NetBSD again. BUG: 1129939 Change-Id: I397aa726ab8bf7d91fa0d6d870a30910a5f4a5d9 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/10616 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators/features/glupy/src')
-rw-r--r--xlators/features/glupy/src/Makefile.am9
-rw-r--r--xlators/features/glupy/src/glupy/Makefile.am5
-rw-r--r--xlators/features/glupy/src/glupy/__init__.py (renamed from xlators/features/glupy/src/glupy.py)0
3 files changed, 11 insertions, 3 deletions
diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am
index 0354b1e9dba..2ac0d99cd5f 100644
--- a/xlators/features/glupy/src/Makefile.am
+++ b/xlators/features/glupy/src/Makefile.am
@@ -14,8 +14,11 @@ glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
noinst_HEADERS = glupy.h
-# Install glupy.py into the Python site-packages area
-pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy
-pyglupy_PYTHON = glupy.py __init__.py
+# Install __init__.py into the Python site-packages area
+pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster
+pyglupy_PYTHON = __init__.py
+
+# Install glupy/__init_-.py into the Python site-packages area
+SUBDIRS = glupy
CLEANFILES =
diff --git a/xlators/features/glupy/src/glupy/Makefile.am b/xlators/features/glupy/src/glupy/Makefile.am
new file mode 100644
index 00000000000..573d2da12e1
--- /dev/null
+++ b/xlators/features/glupy/src/glupy/Makefile.am
@@ -0,0 +1,5 @@
+# Install __init__.py into the Python site-packages area
+pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy
+pyglupy_PYTHON = __init__.py
+
+CLEANFILES =
diff --git a/xlators/features/glupy/src/glupy.py b/xlators/features/glupy/src/glupy/__init__.py
index b9fc3700fa6..b9fc3700fa6 100644
--- a/xlators/features/glupy/src/glupy.py
+++ b/xlators/features/glupy/src/glupy/__init__.py