summaryrefslogtreecommitdiffstats
path: root/xlators/features/glupy
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2015-05-07 18:29:31 +0200
committerVijay Bellur <vbellur@redhat.com>2015-05-07 20:09:10 -0700
commitc0ca8aee8085bce0418c6e0cfc3504bc59f60cdb (patch)
treef2235339c940592b36a25569267a2770d2bb6d42 /xlators/features/glupy
parent44d860c7061f7ef375001251876d91c2ec2db86f (diff)
glupy: fix tuntime search path and python module directory layo
ut 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. Backport of: I397aa726ab8bf7d91fa0d6d870a30910a5f4a5d9 BUG: 1212676 Change-Id: Ie48916d71f0f1a357d65c3c22b5e7d7276d720db Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/10650 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Tested-by: NetBSD Build System Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/features/glupy')
-rw-r--r--xlators/features/glupy/src/Makefile.am5
-rw-r--r--xlators/features/glupy/src/glupy/Makefile.am10
-rw-r--r--xlators/features/glupy/src/glupy/__init__.py (renamed from xlators/features/glupy/src/glupy.py)0
3 files changed, 14 insertions, 1 deletions
diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am
index 697f0c7..655f953 100644
--- a/xlators/features/glupy/src/Makefile.am
+++ b/xlators/features/glupy/src/Makefile.am
@@ -16,6 +16,9 @@ noinst_HEADERS = glupy.h
# Install glupy.py into the Python site-packages area
pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster
-pyglupy_PYTHON = glupy.py __init__.py
+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 0000000..db79dcc
--- /dev/null
+++ b/xlators/features/glupy/src/glupy/Makefile.am
@@ -0,0 +1,10 @@
+# Install __init__.py into the Python site-packages area
+pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy
+pyglupy_PYTHON = __init__.py
+
+CLEANFILES =
+# 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 b9fc370..b9fc370 100644
--- a/xlators/features/glupy/src/glupy.py
+++ b/xlators/features/glupy/src/glupy/__init__.py