summaryrefslogtreecommitdiff
path: root/lang/python36
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2021-11-26 17:02:16 +0100
committerDimitry Andric <dim@FreeBSD.org>2021-11-26 19:48:57 +0100
commit4af982e6bea019a33ae85c6c92a3042fadccb739 (patch)
treecf9def6119191e2a31641836d0e1158651d338ac /lang/python36
parentlang/gnu-apl: unbreak the build on recent -CURRENT (clang 13.0.0) (diff)
lang/python3(6|7|8|9|10|11): work around unwanted multiarch detection again
In ports 6bef09666460 we patched out python's erroneous multiarch detection using sed, but upstream changed the surrounding parts in the configure script to defeat the regex we were using. Update the regex to cope with the change. PR: 259896, 258377 MFH: 2021Q4 Approved by: maintainer timeout (9 days)
Diffstat (limited to 'lang/python36')
-rw-r--r--lang/python36/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index ff039c4118b8..9a30d37773c3 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -128,8 +128,7 @@ PLIST_SUB+= NO_NIS=""
post-patch:
# disable detection of multiarch as it breaks with clang >= 13, which adds a
# major.minor version number in -print-multiarch output, confusing Python
- @${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \
- ${WRKSRC}/configure.ac
+ @${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure
post-install:
.if ! ${PORT_OPTIONS:MDEBUG}