diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-09-27 17:39:05 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-09-27 17:56:59 +0000 |
| commit | 6bef09666460fb9f9052550854fa69f5d5e4a0e8 (patch) | |
| tree | d7323851d190ce5e250f827559fcc9a0e1606da8 | |
| parent | 0e6da3c2e1f0ca151be9e6428dcc9c0b7f19d170 (diff) | |
| download | ports-6bef09666460fb9f9052550854fa69f5d5e4a0e8.tar.gz ports-6bef09666460fb9f9052550854fa69f5d5e4a0e8.zip | |
lang/python3([6-9]|10): disable detection of multiarch
It breaks with clang >= 13, which adds a major.minor version number in
-print-multiarch output, and the dot confuses Python:
ModuleNotFoundError: No module named '_sysconfigdata__freebsd14_x86_64-unknown-freebsd14'
Since we do not support multiarch, and the configure script has no way
to disable the multiarch check, stub it out during post-patch.
PR: 258377
Approved by: maintainer timeout (2 weeks)
MFH: 2021Q3
| -rw-r--r-- | lang/python310/Makefile | 4 | ||||
| -rw-r--r-- | lang/python36/Makefile | 6 | ||||
| -rw-r--r-- | lang/python37/Makefile | 4 | ||||
| -rw-r--r-- | lang/python38/Makefile | 4 | ||||
| -rw-r--r-- | lang/python39/Makefile | 4 |
5 files changed, 22 insertions, 0 deletions
diff --git a/lang/python310/Makefile b/lang/python310/Makefile index 3dbf8d5d004e..64aba656d340 100644 --- a/lang/python310/Makefile +++ b/lang/python310/Makefile @@ -124,6 +124,10 @@ post-patch: # which introduces hidden dependency and breaks build @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py +# 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 # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS} diff --git a/lang/python36/Makefile b/lang/python36/Makefile index 93aa71936d4d..5b67fbd5044a 100644 --- a/lang/python36/Makefile +++ b/lang/python36/Makefile @@ -124,6 +124,12 @@ DISABLED_EXTENSIONS+= nis PLIST_SUB+= NO_NIS="" .endif +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 + post-install: .if ! ${PORT_OPTIONS:MDEBUG} ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975 diff --git a/lang/python37/Makefile b/lang/python37/Makefile index 8909af0dd7ab..4db00e66e9d2 100644 --- a/lang/python37/Makefile +++ b/lang/python37/Makefile @@ -111,6 +111,10 @@ post-patch: # which introduces hidden dependency and breaks build @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py +# 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 # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS} diff --git a/lang/python38/Makefile b/lang/python38/Makefile index 68359a8579a8..f3dcec0757fa 100644 --- a/lang/python38/Makefile +++ b/lang/python38/Makefile @@ -115,6 +115,10 @@ post-patch: # which introduces hidden dependency and breaks build @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py +# 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 # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS} diff --git a/lang/python39/Makefile b/lang/python39/Makefile index 4a0d31ba17f2..2d052cf3741d 100644 --- a/lang/python39/Makefile +++ b/lang/python39/Makefile @@ -116,6 +116,10 @@ post-patch: # which introduces hidden dependency and breaks build @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py +# 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 # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS} |