lang/python310: use same mechanism to strip e2fsprogs-libuuid as other lang/python3* ports

PR:		 251489
This commit is contained in:
Matthias Andree
2025-06-28 10:26:57 +02:00
parent 63fc4ff502
commit e8ac4b4306
2 changed files with 4 additions and 32 deletions

View File

@@ -107,6 +107,10 @@ EXTRA_PATCHES+= ${PATCHDIR}/libressl
.endif
post-patch:
# disable the detection of includes and library from e2fsprogs-libuuid,
# which introduces hidden dependency and breaks build
@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
# 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=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure

View File

@@ -1,32 +0,0 @@
Disable the detection of includes and library from e2fsprogs-libuuid, which
introduces hidden dependency and breaks build
--- configure.orig 2022-08-01 20:25:27 UTC
+++ configure
@@ -6625,7 +6625,7 @@ fi
if test "$Py_LTO" = 'true' ; then
case $CC in
- *clang*)
+ *clang*|cc)
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args.
@@ -10123,7 +10123,7 @@ fi
# Dynamic linking for HP-UX
# checks for uuid.h location
-for ac_header in uuid/uuid.h uuid.h
+for ac_header in uuid.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -10141,7 +10141,7 @@ done
$as_echo_n "checking for uuid_generate_time_safe... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <uuid/uuid.h>
+#include <uuid.h>
int
main ()
{