git: 693abe1cb40b - main - lang/python3X: Fix library installation

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Wed, 13 Oct 2021 17:05:48 UTC
The branch main has been updated by thierry:

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

commit 693abe1cb40ba9f505b2c72497443ca3ce85887d
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2021-10-13 16:48:56 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2021-10-13 17:05:40 +0000

    lang/python3X: Fix library installation
    
    The Python ports install the library libpython3.x.so under $PREFIX/lib,
    and they set USE_LDCONFIG, but these libraries are not registered, due
    to a missing symlink, and they are not found by `ldconfig -r'.
    
    This commit make them to be registered, and for some reason it helps the
    dynamic linker to find them, and this allows to fix an error in
    french/aster. It also helps to fix errors in newer releases of math/sage
    (not yet ready to be committed due to other problems).
    
    No exp-run, but it has been tested with many ports on several platforms.
    
    PR:             257864
    Approved by:    koobs (Python team)
    MFH:            2021Q4
---
 lang/python310/Makefile  | 2 ++
 lang/python310/pkg-plist | 1 +
 lang/python36/Makefile   | 2 ++
 lang/python36/pkg-plist  | 1 +
 lang/python37/Makefile   | 2 ++
 lang/python37/pkg-plist  | 1 +
 lang/python38/Makefile   | 2 ++
 lang/python38/pkg-plist  | 1 +
 lang/python39/Makefile   | 2 ++
 lang/python39/pkg-plist  | 1 +
 10 files changed, 15 insertions(+)

diff --git a/lang/python310/Makefile b/lang/python310/Makefile
index 508b194c02aa..c74cb102450a 100644
--- a/lang/python310/Makefile
+++ b/lang/python310/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	python
 DISTVERSION=	${PYTHON_DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
@@ -138,6 +139,7 @@ post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: https://bugs.python.org/issue17975
 .endif
+	${LN} -sf libpython${PYTHON_VER}${ABIFLAGS}.so.1.0 ${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1
 # This code block exists for the qemu-user enabled cross build environment.
 # When using this environment in poudriere, CC is not set to the default
 # of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
diff --git a/lang/python310/pkg-plist b/lang/python310/pkg-plist
index 7de37fee9168..34a04ee2bf79 100644
--- a/lang/python310/pkg-plist
+++ b/lang/python310/pkg-plist
@@ -166,6 +166,7 @@ include/python%%XYDOT%%%%ABI%%/unicodeobject.h
 include/python%%XYDOT%%%%ABI%%/warnings.h
 include/python%%XYDOT%%%%ABI%%/weakrefobject.h
 lib/libpython%%XYDOT%%%%ABI%%.so
+lib/libpython%%XYDOT%%%%ABI%%.so.1
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0-gdb.py
 lib/python%%XYDOT%%/LICENSE.txt
diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index 5b67fbd5044a..ff039c4118b8 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	python
 DISTVERSION=	${PYTHON_DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
@@ -134,6 +135,7 @@ post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: https://bugs.python.org/issue17975
 .endif
+	${LN} -sf libpython${PYTHON_VER}${ABIFLAGS}.so.1.0 ${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1
 # This code block exists for the qemu-user enabled cross build environment.
 # When using this environment in poudriere, CC is not set to the default
 # of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
diff --git a/lang/python36/pkg-plist b/lang/python36/pkg-plist
index cb338df1412e..ce26bc549bad 100644
--- a/lang/python36/pkg-plist
+++ b/lang/python36/pkg-plist
@@ -105,6 +105,7 @@ include/python%%XYDOT%%%%ABI%%/unicodeobject.h
 include/python%%XYDOT%%%%ABI%%/warnings.h
 include/python%%XYDOT%%%%ABI%%/weakrefobject.h
 lib/libpython%%XYDOT%%%%ABI%%.so
+lib/libpython%%XYDOT%%%%ABI%%.so.1
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0-gdb.py
 lib/python%%XYDOT%%/LICENSE.txt
diff --git a/lang/python37/Makefile b/lang/python37/Makefile
index 4db00e66e9d2..3634f533be11 100644
--- a/lang/python37/Makefile
+++ b/lang/python37/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	python
 DISTVERSION=	${PYTHON_DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
@@ -125,6 +126,7 @@ post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: https://bugs.python.org/issue17975
 .endif
+	${LN} -sf libpython${PYTHON_VER}${ABIFLAGS}.so.1.0 ${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1
 # This code block exists for the qemu-user enabled cross build environment.
 # When using this environment in poudriere, CC is not set to the default
 # of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
diff --git a/lang/python37/pkg-plist b/lang/python37/pkg-plist
index 0ab606c1c174..b876ababb619 100644
--- a/lang/python37/pkg-plist
+++ b/lang/python37/pkg-plist
@@ -116,6 +116,7 @@ include/python%%XYDOT%%%%ABI%%/unicodeobject.h
 include/python%%XYDOT%%%%ABI%%/warnings.h
 include/python%%XYDOT%%%%ABI%%/weakrefobject.h
 lib/libpython%%XYDOT%%%%ABI%%.so
+lib/libpython%%XYDOT%%%%ABI%%.so.1
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0-gdb.py
 lib/python%%XYDOT%%/LICENSE.txt
diff --git a/lang/python38/Makefile b/lang/python38/Makefile
index f3dcec0757fa..6597443318e7 100644
--- a/lang/python38/Makefile
+++ b/lang/python38/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	python
 DISTVERSION=	${PYTHON_DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
@@ -129,6 +130,7 @@ post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: https://bugs.python.org/issue17975
 .endif
+	${LN} -sf libpython${PYTHON_VER}${ABIFLAGS}.so.1.0 ${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1
 # This code block exists for the qemu-user enabled cross build environment.
 # When using this environment in poudriere, CC is not set to the default
 # of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
diff --git a/lang/python38/pkg-plist b/lang/python38/pkg-plist
index 6b57ecef4860..2101abcd5f61 100644
--- a/lang/python38/pkg-plist
+++ b/lang/python38/pkg-plist
@@ -138,6 +138,7 @@ include/python%%XYDOT%%%%ABI%%/unicodeobject.h
 include/python%%XYDOT%%%%ABI%%/warnings.h
 include/python%%XYDOT%%%%ABI%%/weakrefobject.h
 lib/libpython%%XYDOT%%%%ABI%%.so
+lib/libpython%%XYDOT%%%%ABI%%.so.1
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0-gdb.py
 lib/python%%XYDOT%%/LICENSE.txt
diff --git a/lang/python39/Makefile b/lang/python39/Makefile
index 2d052cf3741d..d596c2a0de50 100644
--- a/lang/python39/Makefile
+++ b/lang/python39/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	python
 DISTVERSION=	${PYTHON_DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
@@ -130,6 +131,7 @@ post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: https://bugs.python.org/issue17975
 .endif
+	${LN} -sf libpython${PYTHON_VER}${ABIFLAGS}.so.1.0 ${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1
 # This code block exists for the qemu-user enabled cross build environment.
 # When using this environment in poudriere, CC is not set to the default
 # of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
diff --git a/lang/python39/pkg-plist b/lang/python39/pkg-plist
index 5aef06e5237b..9e315a9b5ca3 100644
--- a/lang/python39/pkg-plist
+++ b/lang/python39/pkg-plist
@@ -160,6 +160,7 @@ include/python%%XYDOT%%%%ABI%%/unicodeobject.h
 include/python%%XYDOT%%%%ABI%%/warnings.h
 include/python%%XYDOT%%%%ABI%%/weakrefobject.h
 lib/libpython%%XYDOT%%%%ABI%%.so
+lib/libpython%%XYDOT%%%%ABI%%.so.1
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0
 lib/libpython%%XYDOT%%%%ABI%%.so.1.0-gdb.py
 lib/python%%XYDOT%%/LICENSE.txt