diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-12-20 13:06:03 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-12-20 13:06:03 +0000 |
| commit | b7065dadd0b4c01f40ccefe1d0d234e49c36405f (patch) | |
| tree | f712afd4f3f61fdfcfff6891c2f63326498dc9c3 /usr/src/lib/pysolaris | |
| parent | 64570bd313f25b33a67193828aa20d7a15c3fed0 (diff) | |
| parent | a22312a2010fbc0fae7e50874e1cc393f1256887 (diff) | |
| download | illumos-joyent-b7065dadd0b4c01f40ccefe1d0d234e49c36405f.tar.gz | |
[illumos-gate merge]
commit a22312a2010fbc0fae7e50874e1cc393f1256887
10065 exception_lists: remove some loader exceptions
commit ae72ee9643cbd127139a2b6363b3f9c2872a5578
10061 usr/src/lib/libc/port/gen/l3.c is unused
commit d81547170496f442be8d1f2761ffcd2781f726b2
10056 9894 broke PYTHON_VERSION
Conflicts:
exception_lists/hdrchk
exception_lists/cstyle
Diffstat (limited to 'usr/src/lib/pysolaris')
| -rw-r--r-- | usr/src/lib/pysolaris/Makefile.com | 6 | ||||
| -rw-r--r-- | usr/src/lib/pysolaris/amd64/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/pysolaris/i386/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/pysolaris/py3/Makefile | 8 |
4 files changed, 13 insertions, 7 deletions
diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com index 3d4c4777ce..89e5d16546 100644 --- a/usr/src/lib/pysolaris/Makefile.com +++ b/usr/src/lib/pysolaris/Makefile.com @@ -33,7 +33,7 @@ include ../../Makefile.lib LIBLINKS = SRCDIR = ../common -ROOTLIBDIR= $(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris +ROOTLIBDIR= $(ROOT)/usr/lib/python$(PYVER)/vendor-packages/solaris ROOTLIBDIR64= $(ROOTLIBDIR)/64 PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc) PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc) @@ -43,12 +43,12 @@ CSTD= $(CSTD_GNU99) C99LMODE= -Xc99=%all LIBS = $(DYNLIB) -LDLIBS += -lc -lsec -lidmap -lpython$(PYTHON_VERSION)$(PYTHON_SUFFIX) +LDLIBS += -lc -lsec -lidmap -lpython$(PYVER)$(PYSUFFIX) CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 CERRWARN += -_gcc=-Wno-unused-variable CPPFLAGS += \ - -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)$(PYTHON_SUFFIX) + -I$(ADJUNCT_PROTO)/usr/include/python$(PYVER)$(PYSUFFIX) all: diff --git a/usr/src/lib/pysolaris/amd64/Makefile b/usr/src/lib/pysolaris/amd64/Makefile index 4fa33a90bd..91c7fbd58b 100644 --- a/usr/src/lib/pysolaris/amd64/Makefile +++ b/usr/src/lib/pysolaris/amd64/Makefile @@ -16,6 +16,9 @@ # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. # +PYVER = $(PYTHON_VERSION) +PYSUFFIX = $(PYTHON_SUFFIX) + include ../Makefile.com include ../../Makefile.lib.64 diff --git a/usr/src/lib/pysolaris/i386/Makefile b/usr/src/lib/pysolaris/i386/Makefile index 926da3004e..c34c0504de 100644 --- a/usr/src/lib/pysolaris/i386/Makefile +++ b/usr/src/lib/pysolaris/i386/Makefile @@ -23,6 +23,9 @@ # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. # +PYVER = $(PYTHON_VERSION) +PYSUFFIX = $(PYTHON_SUFFIX) + include ../Makefile.com all: $(PYOBJS) $(LIBS) diff --git a/usr/src/lib/pysolaris/py3/Makefile b/usr/src/lib/pysolaris/py3/Makefile index 700cc16ca5..12abf943c4 100644 --- a/usr/src/lib/pysolaris/py3/Makefile +++ b/usr/src/lib/pysolaris/py3/Makefile @@ -16,9 +16,9 @@ include ../Makefile.com include ../../Makefile.lib.64 -PYTHON = $(PYTHON3) -PYTHON_VERSION = $(PYTHON3_VERSION) -PYTHON_SUFFIX = $(PYTHON3_SUFFIX) +PYSHEBANG = $(PYTHON3) +PYVER = $(PYTHON3_VERSION) +PYSUFFIX = $(PYTHON3_SUFFIX) LDLIBS64 += -L$(ADJUNCT_PROTO)/usr/lib/$(MACH64) MAPFILES= $(SRCDIR)/mapfile-py3 @@ -33,5 +33,5 @@ $(ROOTLIBDIR)/%.so: %.so $(ROOTLIBDIR)/%: ../common/% $(INS.pyfile) - $(PYTHON) -mpy_compile $@ + $(PYTHON3) -mpy_compile $@ |