Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Apr 2021 14:56:29 GMT
From:      Kai Knoblich <kai@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cd5b03f6927e - main - graphics/py-openimageio: Fix packaging with Python 3.8+
Message-ID:  <202104191456.13JEuTs3049914@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cd5b03f6927ebf6c3966816a91b10ea223a84910

commit cd5b03f6927ebf6c3966816a91b10ea223a84910
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2021-04-19 14:41:42 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2021-04-19 14:53:13 +0000

    graphics/py-openimageio: Fix packaging with Python 3.8+
    
    * Apply the same fix as in 9cb5898561b302d952fec8e2fac66a945a2c4915 by
      using wildcard paths and adjust the pkg-plist for the Python bindings
      as well.
    
    * Also use PYTHONPREFIX_SITELIBDIR instead PYTHON_SITELIBDIR to make
      the port PREFIX safe while I'm here.
    
    PR:             253815
    Approved by:    python (with hat)
---
 graphics/openimageio/Makefile         | 4 ++--
 graphics/openimageio/pkg-plist-pybind | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 3132881e843b..2982b645dc59 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -117,8 +117,8 @@ CMAKE_OFF+=	USE_QT USE_OPENGL OIIO_BUILD_TOOLS OIIO_BUILD_TESTS
 CMAKE_ARGS+=	-DPYTHON_VERSION:STRING=${PYTHON_VER}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 .else # SLAVE_PORT != yes
 USE_LDCONFIG=	yes
 CMAKE_OFF+=	USE_PYTHON
diff --git a/graphics/openimageio/pkg-plist-pybind b/graphics/openimageio/pkg-plist-pybind
index b649adc8a98e..3fcce11e90ec 100644
--- a/graphics/openimageio/pkg-plist-pybind
+++ b/graphics/openimageio/pkg-plist-pybind
@@ -1 +1 @@
-%%PYTHON_SITELIBDIR%%/OpenImageIO.so
+%%PYTHON_SITELIBDIR%%/OpenImageIO%%PYTHON_EXT_SUFFIX%%.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104191456.13JEuTs3049914>