mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
lang/python3?: Fix python3.?-config behavior when symlinked
When python3.?-config is symlinked to another location it starts outputting bogus paths. For example $ pwd /home/tobias $ python3.6-config --includes -I/usr/local/include/python3.6m -I/usr/local/include/python3.6m $ ln -s /usr/local/bin/python3.6-config python3-config $ ./python3-config --includes -I/home/include/python3.6m -I/home/include/python3.6m This breaks ports trying to use BINARY_ALIAS together with python3.?-config. Apply a patch to resolve the symlink first before trying to find the install prefix. PR: 229749 Submitted by: tobik Reviewed by: antoine, miwi Approved by: python (miwi)
This commit is contained in:
parent
2bd5dbae1f
commit
dcbb4afe98
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=475350
8 changed files with 48 additions and 1 deletions
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= python
|
||||
PORTVERSION= ${PYTHON_PORTVERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= lang python ipv6
|
||||
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
|
||||
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
|
||||
|
|
11
lang/python34/files/patch-Misc__python-config.sh.in
Normal file
11
lang/python34/files/patch-Misc__python-config.sh.in
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- Misc/python-config.sh.in.orig 2018-07-13 21:07:16 UTC
|
||||
+++ Misc/python-config.sh.in
|
||||
@@ -15,7 +15,7 @@ fi
|
||||
# Returns the actual prefix where this script was installed to.
|
||||
installed_prefix ()
|
||||
{
|
||||
- RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
|
||||
+ RESULT=$(dirname $(cd $(dirname $(realpath "$1")) && pwd -P))
|
||||
if which readlink >/dev/null 2>&1 ; then
|
||||
if readlink -f "$RESULT" >/dev/null 2>&1; then
|
||||
RESULT=$(readlink -f "$RESULT")
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= python
|
||||
PORTVERSION= ${PYTHON_PORTVERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= lang python ipv6
|
||||
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
|
||||
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
|
||||
|
|
11
lang/python35/files/patch-Misc__python-config.sh.in
Normal file
11
lang/python35/files/patch-Misc__python-config.sh.in
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- Misc/python-config.sh.in.orig 2018-07-13 21:07:16 UTC
|
||||
+++ Misc/python-config.sh.in
|
||||
@@ -15,7 +15,7 @@ fi
|
||||
# Returns the actual prefix where this script was installed to.
|
||||
installed_prefix ()
|
||||
{
|
||||
- RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
|
||||
+ RESULT=$(dirname $(cd $(dirname $(realpath "$1")) && pwd -P))
|
||||
if which readlink >/dev/null 2>&1 ; then
|
||||
if readlink -f "$RESULT" >/dev/null 2>&1; then
|
||||
RESULT=$(readlink -f "$RESULT")
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= python
|
||||
PORTVERSION= ${PYTHON_PORTVERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= lang python ipv6
|
||||
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
|
||||
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
|
||||
|
|
11
lang/python36/files/patch-Misc__python-config.sh.in
Normal file
11
lang/python36/files/patch-Misc__python-config.sh.in
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- Misc/python-config.sh.in.orig 2018-07-13 21:07:16 UTC
|
||||
+++ Misc/python-config.sh.in
|
||||
@@ -15,7 +15,7 @@ fi
|
||||
# Returns the actual prefix where this script was installed to.
|
||||
installed_prefix ()
|
||||
{
|
||||
- RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
|
||||
+ RESULT=$(dirname $(cd $(dirname $(realpath "$1")) && pwd -P))
|
||||
if which readlink >/dev/null 2>&1 ; then
|
||||
if readlink -f "$RESULT" >/dev/null 2>&1; then
|
||||
RESULT=$(readlink -f "$RESULT")
|
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= python
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
PORTVERSION= ${PYTHON_PORTVERSION}
|
||||
CATEGORIES= lang python ipv6
|
||||
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
|
||||
|
|
11
lang/python37/files/patch-Misc__python-config.sh.in
Normal file
11
lang/python37/files/patch-Misc__python-config.sh.in
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- Misc/python-config.sh.in.orig 2018-07-13 21:07:16 UTC
|
||||
+++ Misc/python-config.sh.in
|
||||
@@ -15,7 +15,7 @@ fi
|
||||
# Returns the actual prefix where this script was installed to.
|
||||
installed_prefix ()
|
||||
{
|
||||
- RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
|
||||
+ RESULT=$(dirname $(cd $(dirname $(realpath "$1")) && pwd -P))
|
||||
if which readlink >/dev/null 2>&1 ; then
|
||||
if readlink -f "$RESULT" >/dev/null 2>&1; then
|
||||
RESULT=$(readlink -f "$RESULT")
|
Loading…
Add table
Reference in a new issue