From b7829f857ea252280b9790bdc225ac9ab384a5d5 Mon Sep 17 00:00:00 2001 From: Aurelien Larcher <aurelien.larcher@gmail.com> Date: Sun, 10 Jan 2021 23:31:56 +0100 Subject: [PATCH] transforms: fixup python-3-soabi (solaris-userland) --- make-rules/shared-macros.mk | 4 ++-- transforms/python-3-soabi | 12 ++++++++---- components/network/samba/Makefile | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/components/network/samba/Makefile b/components/network/samba/Makefile index 91e2940..6ac9ea2 100644 --- a/components/network/samba/Makefile +++ b/components/network/samba/Makefile @@ -48,7 +48,7 @@ PERL_VERSION = 5.24 PYTHON_VERSION = 3.5 -PY3_CYTHON_NAMING =\# +PY3_CPYTHON_NAMING =\# # set WAF and adapt PATH for building WAF = $(PYTHON) $(SOURCE_DIR)/buildtools/bin/waf diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk index 39192d6..f0cb360 100644 --- a/make-rules/shared-macros.mk +++ b/make-rules/shared-macros.mk @@ -181,10 +181,10 @@ # only python/xattr and python/cryptography require abi3 naming. PYTHON3_SOABI ?= cpython ifeq ($(PYTHON3_SOABI),cpython) -PY3_CYTHON_NAMING= +PY3_CPYTHON_NAMING= PY3_ABI3_NAMING=\# else ifeq ($(PYTHON3_SOABI),abi3) -PY3_CYTHON_NAMING=\# +PY3_CPYTHON_NAMING=\# PY3_ABI3_NAMING= else $(error "Invalid python naming scheme '$(PYTHON3_SOABI)' selected!") diff --git a/transforms/python-3-soabi b/transforms/python-3-soabi index 24c59ef..1c31cbd 100644 --- a/transforms/python-3-soabi +++ b/transforms/python-3-soabi @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. # # Python 2's ABI for .so files is to simply append ".so". But for Python @@ -28,9 +28,13 @@ # "d" is added if built --with-pydebug (we don't), "m" is added if built # --with-pymalloc (we do) and "u" is added if built --with-wide-unicode # (we don't). See http://legacy.python.org/dev/peps/pep-3149/ for details. -$(PY3_CYTHON_NAMING)<transform file -> edit path \ -$(PY3_CYTHON_NAMING) (usr/lib/python3.)([4-9])(/vendor-packages/(.*/)?(64/)?.*)\.so$ \ -$(PY3_CYTHON_NAMING) \\1\\2\\3.cpython-3\\2m.so > +$(PY3_CPYTHON_NAMING)<transform file -> edit path \ +$(PY3_CPYTHON_NAMING) (usr/lib/python3.)([4-7])(/vendor-packages/(.*/)?(64/)?.*)\.so$ \ +$(PY3_CPYTHON_NAMING) \\1\\2\\3.cpython-3\\2m.so > + +$(PY3_CPYTHON_NAMING)<transform file -> edit path \ +$(PY3_CPYTHON_NAMING) (usr/lib/python3.)([8-9])(/vendor-packages/(.*/)?(64/)?.*)\.so$ \ +$(PY3_CPYTHON_NAMING) \\1\\2\\3.cpython-3\\2.so > # A newer version of python setup tools enables to create ABI3 compliant # extensions that should support all python3.X versions where X >= 2. -- Gitblit v1.9.3