Attachment 215000 Details for Bug 242896 – Patch.

[patch] Patch.

python-242896.diff (text/plain), 4.75 KB, created by Christian Ullrich on 2020-05-29 06:57:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ullrich

Created: 2020-05-29 06:57:56 UTC

Size: 4.75 KB

patch

obsolete

>commit fe37ccef7d89fa15256fe97daf952e8a4e2e32f8
>Author: Christian Ullrich <chris@chrullrich.net>
>Date:   Fri Dec 27 10:26:05 2019 +0100
>
>    Fix FreeBSD bug #242896.
>    
>    lang/python27 already had this fix, with a slightly different command line.
>    
>    Also, use ${ABIFLAGS} wherever appropriate instead of hardcoding.
>
>diff --git a/lang/python35/Makefile b/lang/python35/Makefile
>index ca4a2944e1dd..a4ea93cf0004 100644
>--- a/lang/python35/Makefile
>+++ b/lang/python35/Makefile
>@@ -141,8 +141,17 @@ post-install:
> .if ${CC} == /nxb-bin/usr/bin/cc
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
> 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata.py
>+	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
>+		./python -E -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata.py
>+	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
>+		./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata.py
>+	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
>+		./python -E -OO -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata.py
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
>-		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}m/Makefile
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}${ABIFLAGS}/Makefile
> .endif
> 	for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
> 		${STRIP_CMD} $$i; done								# Strip shared extensions
>diff --git a/lang/python36/Makefile b/lang/python36/Makefile
>index a0e258e53a61..c006e29bb3ed 100644
>--- a/lang/python36/Makefile
>+++ b/lang/python36/Makefile
>@@ -134,15 +134,18 @@ post-install:
> # FreeBSD base system provides.  sbruno 02Aug2017
> .if ${CC} == /nxb-bin/usr/bin/cc
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
>-		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_m_freebsd${OSREL:R}_.py
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
> 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
> 		./python -E -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
>-		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_m_freebsd${OSREL:R}_.py
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
> 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
> 		./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
>-		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_m_freebsd${OSREL:R}_.py
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
>+	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
>+		./python -E -OO -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
>-		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}m/Makefile
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}${ABIFLAGS}/Makefile
> .endif
> 	for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
> 		${STRIP_CMD} $$i; done								# Strip shared extensions
>diff --git a/lang/python37/Makefile b/lang/python37/Makefile
>index 6b157ede9fd3..1ef992350d74 100644
>--- a/lang/python37/Makefile
>+++ b/lang/python37/Makefile
>@@ -131,6 +131,9 @@ post-install:
> 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
> 		./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
> 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
>+	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
>+		./python -E -OO -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
> 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}${ABIFLAGS}/Makefile
> .endif
>diff --git a/lang/python38/Makefile b/lang/python38/Makefile
>index 53fb18ba0267..4f15bd3d58f0 100644
>--- a/lang/python38/Makefile
>+++ b/lang/python38/Makefile
>@@ -138,6 +138,9 @@ post-install:
> 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
> 		./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
> 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
>+	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
>+		./python -E -OO -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
>+		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
> 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
> 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}${ABIFLAGS}/Makefile
> .endif

Flags:

chris: maintainer-approval?

Actions: View | Diff

Attachments on bug 242896: 210252 | 215000