diff options
Diffstat (limited to 'xlators')
-rwxr-xr-x | xlators/experimental/fdl/src/gen_dumper.py | 2 | ||||
-rwxr-xr-x | xlators/experimental/fdl/src/gen_fdl.py | 2 | ||||
-rwxr-xr-x | xlators/experimental/fdl/src/gen_recon.py | 2 | ||||
-rwxr-xr-x | xlators/experimental/jbr-client/src/gen-fops.py | 2 | ||||
-rwxr-xr-x | xlators/experimental/jbr-server/src/gen-fops.py | 2 | ||||
-rw-r--r-- | xlators/features/changelog/lib/examples/python/changes.py | 2 | ||||
-rw-r--r-- | xlators/features/glupy/src/Makefile.am | 15 | ||||
-rw-r--r-- | xlators/features/glupy/src/__init__.py.in | 2 |
8 files changed, 14 insertions, 15 deletions
diff --git a/xlators/experimental/fdl/src/gen_dumper.py b/xlators/experimental/fdl/src/gen_dumper.py index c15f7c8870d..15221544b1c 100755 --- a/xlators/experimental/fdl/src/gen_dumper.py +++ b/xlators/experimental/fdl/src/gen_dumper.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function import os diff --git a/xlators/experimental/fdl/src/gen_fdl.py b/xlators/experimental/fdl/src/gen_fdl.py index 8647ba7b6f1..467ec8927b7 100755 --- a/xlators/experimental/fdl/src/gen_fdl.py +++ b/xlators/experimental/fdl/src/gen_fdl.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function import os diff --git a/xlators/experimental/fdl/src/gen_recon.py b/xlators/experimental/fdl/src/gen_recon.py index 0934e2b3d4e..0766f61320a 100755 --- a/xlators/experimental/fdl/src/gen_recon.py +++ b/xlators/experimental/fdl/src/gen_recon.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function import os diff --git a/xlators/experimental/jbr-client/src/gen-fops.py b/xlators/experimental/jbr-client/src/gen-fops.py index 47b339910d4..a5ddf577fbe 100755 --- a/xlators/experimental/jbr-client/src/gen-fops.py +++ b/xlators/experimental/jbr-client/src/gen-fops.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function import os diff --git a/xlators/experimental/jbr-server/src/gen-fops.py b/xlators/experimental/jbr-server/src/gen-fops.py index bf6ff912d0c..616782bba45 100755 --- a/xlators/experimental/jbr-server/src/gen-fops.py +++ b/xlators/experimental/jbr-server/src/gen-fops.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # This script generates the boilerplate versions of most fops and cbks in the # server. This allows the details of leadership-status checking, sequencing diff --git a/xlators/features/changelog/lib/examples/python/changes.py b/xlators/features/changelog/lib/examples/python/changes.py index 077c1108cce..c410d3b000d 100644 --- a/xlators/features/changelog/lib/examples/python/changes.py +++ b/xlators/features/changelog/lib/examples/python/changes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function import os diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am index b5d1c964432..25fd48ba176 100644 --- a/xlators/features/glupy/src/Makefile.am +++ b/xlators/features/glupy/src/Makefile.am @@ -4,24 +4,23 @@ xlator_LTLIBRARIES = glupy.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features glupydir = $(xlatordir)/glupy -AM_CPPFLAGS = $(PYTHONDEV_CPPFLAGS) $(GF_CPPFLAGS) \ +AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src \ - -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ - -isystem $(BUILD_PYTHON_INC) + -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src -AM_CFLAGS = $(PYTHONDEV_CPPFLAGS) -Wall -fno-strict-aliasing \ +AM_CFLAGS = -Wall -fno-strict-aliasing \ -DGLUSTER_PYTHON_PATH=\"$(glupydir)\" \ -DPATH_GLUSTERFS_GLUPY_MODULE=\"${xlatordir}/glupy${shrext_cmds}\" \ - $(GF_CFLAGS) + $(GF_CFLAGS) $(PYTHON_CFLAGS) # Flags to build glupy.so with -glupy_la_LDFLAGS = $(PYTHONDEV_LDFLAGS) -module -avoid-version -nostartfiles \ +glupy_la_LDFLAGS = -module -avoid-version -nostartfiles \ -export-symbols $(top_srcdir)/xlators/features/glupy/src/glupy.sym \ - $(GF_NO_UNDEFINED) + $(GF_NO_UNDEFINED) $(PYTHON_LIBS) glupy_la_SOURCES = glupy.c glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - -lpthread -l$(BUILD_PYTHON_LIB) $(LIB_DL) + -lpthread $(LIB_DL) noinst_HEADERS = glupy.h diff --git a/xlators/features/glupy/src/__init__.py.in b/xlators/features/glupy/src/__init__.py.in index 2a66079de12..3a28658e401 100644 --- a/xlators/features/glupy/src/__init__.py.in +++ b/xlators/features/glupy/src/__init__.py.in @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from pkgutil import extend_path __path__ = extend_path(__path__, __name__) |