summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/brand/solaris10/cmd/Makefile6
-rw-r--r--usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh.in (renamed from usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh)4
-rw-r--r--usr/src/lib/pylibbe/Makefile.com9
-rw-r--r--usr/src/lib/pysolaris/Makefile.com10
-rw-r--r--usr/src/lib/pysolaris/common/__init__.py2
-rw-r--r--usr/src/lib/pyzfs/Makefile.com10
-rw-r--r--usr/src/lib/pyzfs/common/__init__.py2
-rw-r--r--usr/src/lib/pyzfs/common/allow.py2
-rw-r--r--usr/src/lib/pyzfs/common/dataset.py2
-rw-r--r--usr/src/lib/pyzfs/common/groupspace.py2
-rw-r--r--usr/src/lib/pyzfs/common/holds.py2
-rw-r--r--usr/src/lib/pyzfs/common/table.py2
-rw-r--r--usr/src/lib/pyzfs/common/unallow.py2
-rw-r--r--usr/src/lib/pyzfs/common/userspace.py2
-rw-r--r--usr/src/lib/pyzfs/common/util.py2
15 files changed, 33 insertions, 26 deletions
diff --git a/usr/src/lib/brand/solaris10/cmd/Makefile b/usr/src/lib/brand/solaris10/cmd/Makefile
index bad81c8f61..99ac1cce10 100644
--- a/usr/src/lib/brand/solaris10/cmd/Makefile
+++ b/usr/src/lib/brand/solaris10/cmd/Makefile
@@ -31,6 +31,10 @@ include ../Makefile.s10
# override the install directory
ROOTBIN = $(ROOTBRANDDIR)
CLOBBERFILES = $(ROOTPROGS)
+CLEANFILES += s10_python_wrapper.sh
+
+s10_python_wrapper.sh: s10_python_wrapper.sh.in
+ $(SED) -e "s:@PYTHON_VERSION@:$(PYTHON_VERSION):g" < s10_python_wrapper.sh.in > $@
.KEEP_STATE:
@@ -41,6 +45,6 @@ lint:
install: all $(ROOTPROGS)
clean:
- $(RM) $(PROGS)
+ $(RM) $(PROGS) $(CLEANFILES)
include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh b/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh.in
index b884f62a92..ecb7c27155 100644
--- a/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh
+++ b/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh.in
@@ -38,7 +38,7 @@
pyname=$0
n=/.SUNWnative
-PYTHONPATH=/.SUNWnative/usr/lib/python2.6/vendor-packages
+PYTHONPATH=/.SUNWnative/usr/lib/python@PYTHON_VERSION@/vendor-packages
export PYTHONPATH
# This wrapper is running in the S10 zone so there is no L10N for the
@@ -56,4 +56,4 @@ exec $n/usr/lib/brand/solaris10/s10_native \
-e LD_PRELOAD_64=s10_npreload.so.1 \
-e LD_LIBRARY_PATH_32="$n/lib:$n/usr/lib:$n/usr/lib/mps" \
-e LD_LIBRARY_PATH_64="$n/lib/64:$n/usr/lib/64:$n/usr/lib/mps/64" \
- $n/usr/bin/python2.6 $n$pyname "$@"
+ $n/usr/bin/python@PYTHON_VERSION@ $n$pyname "$@"
diff --git a/usr/src/lib/pylibbe/Makefile.com b/usr/src/lib/pylibbe/Makefile.com
index 9f964ce417..19240f56a5 100644
--- a/usr/src/lib/pylibbe/Makefile.com
+++ b/usr/src/lib/pylibbe/Makefile.com
@@ -30,11 +30,10 @@ OBJECTS = libbe_py.o
include ../../Makefile.lib
-PYTHON = $(PYTHON_26)
LIBLINKS =
SRCDIR = ../common
-ROOTLIBDIR= $(ROOT)/usr/lib/python2.6/vendor-packages
-ROOTLIBDIR64= $(ROOT)/usr/lib/python2.6/vendor-packages/64
+ROOTLIBDIR= $(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages
+ROOTLIBDIR64= $(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/64
PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc)
PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc)
ROOTPYBEFILES= $(PYFILES:%=$(ROOTLIBDIR)/%)
@@ -44,12 +43,12 @@ C99MODE= $(C99_ENABLE)
LIBS = $(DYNLIB)
LDLIBS += -lbe -lnvpair -lc
CFLAGS += $(CCVERBOSE)
-CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 \
+CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION) \
-D_FILE_OFFSET_BITS=64 -I../../libbe/common
.KEEP_STATE:
-all install := LDLIBS += -lpython2.6
+all install := LDLIBS += -lpython$(PYTHON_VERSION)
all: $(PYOBJS) $(LIBS)
diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com
index 28d68704f9..7423665381 100644
--- a/usr/src/lib/pysolaris/Makefile.com
+++ b/usr/src/lib/pysolaris/Makefile.com
@@ -32,20 +32,19 @@ include ../../Makefile.lib
LIBLINKS =
SRCDIR = ../common
-ROOTLIBDIR= $(ROOT)/usr/lib/python2.6/vendor-packages/solaris
+ROOTLIBDIR= $(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris
PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc)
PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc)
ROOTPYSOLFILES= $(PYFILES:%=$(ROOTLIBDIR)/%)
-PYTHON= $(PYTHON_26)
C99MODE= -xc99=%all
C99LMODE= -Xc99=%all
LIBS = $(DYNLIB)
-LDLIBS += -lc -lsec -lidmap -lpython2.6
+LDLIBS += -lc -lsec -lidmap -lpython$(PYTHON_VERSION)
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-variable
-CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6
+CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
.KEEP_STATE:
@@ -56,6 +55,9 @@ install: all $(ROOTPYSOLFILES)
$(ROOTLIBDIR)/%: %
$(INS.pyfile)
+$(ROOTLIBDIR)/%: ../common/%
+ $(INS.pyfile)
+
lint: lintcheck
include ../../Makefile.targ
diff --git a/usr/src/lib/pysolaris/common/__init__.py b/usr/src/lib/pysolaris/common/__init__.py
index 1119f0645a..c811dbb347 100644
--- a/usr/src/lib/pysolaris/common/__init__.py
+++ b/usr/src/lib/pysolaris/common/__init__.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com
index 0c996d0711..668151416d 100644
--- a/usr/src/lib/pyzfs/Makefile.com
+++ b/usr/src/lib/pyzfs/Makefile.com
@@ -35,8 +35,7 @@ include ../../Makefile.lib
LIBLINKS =
SRCDIR = ../common
-ROOTLIBDIR= $(ROOT)/usr/lib/python2.6/vendor-packages/zfs
-PYTHON= $(PYTHON_26)
+ROOTLIBDIR= $(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs
PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc)
PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc)
ROOTPYZFSFILES= $(PYFILES:%=$(ROOTLIBDIR)/%)
@@ -45,10 +44,10 @@ C99MODE= -xc99=%all
C99LMODE= -Xc99=%all
LIBS = $(DYNLIB)
-LDLIBS += -lc -lnvpair -lpython2.6 -lzfs
+LDLIBS += -lc -lnvpair -lpython$(PYTHON_VERSION) -lzfs
CFLAGS += $(CCVERBOSE)
CERRWARN += -_gcc=-Wno-unused-variable
-CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6
+CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
CPPFLAGS += -I../../../uts/common/fs/zfs
CPPFLAGS += -I../../../common/zfs
@@ -61,6 +60,9 @@ install: all $(ROOTPYZFSFILES)
$(ROOTLIBDIR)/%: %
$(INS.pyfile)
+$(ROOTLIBDIR)/%: ../common/%
+ $(INS.pyfile)
+
lint: lintcheck
include ../../Makefile.targ
diff --git a/usr/src/lib/pyzfs/common/__init__.py b/usr/src/lib/pyzfs/common/__init__.py
index 76b0998a3e..5a99094658 100644
--- a/usr/src/lib/pyzfs/common/__init__.py
+++ b/usr/src/lib/pyzfs/common/__init__.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
diff --git a/usr/src/lib/pyzfs/common/allow.py b/usr/src/lib/pyzfs/common/allow.py
index 7ad4b49cc3..2c01280b4b 100644
--- a/usr/src/lib/pyzfs/common/allow.py
+++ b/usr/src/lib/pyzfs/common/allow.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
diff --git a/usr/src/lib/pyzfs/common/dataset.py b/usr/src/lib/pyzfs/common/dataset.py
index 26192e4075..9d4652235a 100644
--- a/usr/src/lib/pyzfs/common/dataset.py
+++ b/usr/src/lib/pyzfs/common/dataset.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
diff --git a/usr/src/lib/pyzfs/common/groupspace.py b/usr/src/lib/pyzfs/common/groupspace.py
index 9f380fdb89..6193456a32 100644
--- a/usr/src/lib/pyzfs/common/groupspace.py
+++ b/usr/src/lib/pyzfs/common/groupspace.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
diff --git a/usr/src/lib/pyzfs/common/holds.py b/usr/src/lib/pyzfs/common/holds.py
index 800e28f974..0a1508e76a 100644
--- a/usr/src/lib/pyzfs/common/holds.py
+++ b/usr/src/lib/pyzfs/common/holds.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
diff --git a/usr/src/lib/pyzfs/common/table.py b/usr/src/lib/pyzfs/common/table.py
index d2a45a142c..87aab1d6f1 100644
--- a/usr/src/lib/pyzfs/common/table.py
+++ b/usr/src/lib/pyzfs/common/table.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
diff --git a/usr/src/lib/pyzfs/common/unallow.py b/usr/src/lib/pyzfs/common/unallow.py
index cbdd4dd73f..630067946e 100644
--- a/usr/src/lib/pyzfs/common/unallow.py
+++ b/usr/src/lib/pyzfs/common/unallow.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
diff --git a/usr/src/lib/pyzfs/common/userspace.py b/usr/src/lib/pyzfs/common/userspace.py
index 8464f54b89..79355e1e23 100644
--- a/usr/src/lib/pyzfs/common/userspace.py
+++ b/usr/src/lib/pyzfs/common/userspace.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
diff --git a/usr/src/lib/pyzfs/common/util.py b/usr/src/lib/pyzfs/common/util.py
index a33c6693ee..cfc21ac57c 100644
--- a/usr/src/lib/pyzfs/common/util.py
+++ b/usr/src/lib/pyzfs/common/util.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
#
# CDDL HEADER START
#
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-27 02:11:08 +0000