mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
gh-121103: Put free-threaded libraries in lib/python3.14t
(#121293)
On POSIX systems, excluding macOS framework installs, the lib directory for the free-threaded build now includes a "t" suffix to avoid conflicts with a co-located default build installation.
This commit is contained in:
parent
5250a03133
commit
e8c91d90ba
13 changed files with 77 additions and 40 deletions
14
configure
generated
vendored
14
configure
generated
vendored
|
@ -928,6 +928,7 @@ DEF_MAKE_RULE
|
|||
DEF_MAKE_ALL_RULE
|
||||
JIT_STENCILS_H
|
||||
REGEN_JIT_COMMAND
|
||||
ABI_THREAD
|
||||
ABIFLAGS
|
||||
LN
|
||||
MKDIR_P
|
||||
|
@ -8160,7 +8161,9 @@ fi
|
|||
|
||||
# For calculating the .so ABI tag.
|
||||
|
||||
|
||||
ABIFLAGS=""
|
||||
ABI_THREAD=""
|
||||
|
||||
# Check for --disable-gil
|
||||
# --disable-gil
|
||||
|
@ -8190,6 +8193,7 @@ printf "%s\n" "#define Py_GIL_DISABLED 1" >>confdefs.h
|
|||
|
||||
# Add "t" for "threaded"
|
||||
ABIFLAGS="${ABIFLAGS}t"
|
||||
ABI_THREAD="t"
|
||||
fi
|
||||
|
||||
# Check for --with-pydebug
|
||||
|
@ -24738,11 +24742,11 @@ fi
|
|||
|
||||
|
||||
|
||||
BINLIBDEST='$(LIBDIR)/python$(VERSION)'
|
||||
BINLIBDEST='$(LIBDIR)/python$(VERSION)$(ABI_THREAD)'
|
||||
|
||||
|
||||
# Check for --with-platlibdir
|
||||
# /usr/$LIDIRNAME/python$VERSION
|
||||
# /usr/$PLATLIBDIR/python$(VERSION)$(ABI_THREAD)
|
||||
|
||||
PLATLIBDIR="lib"
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-platlibdir" >&5
|
||||
|
@ -24761,7 +24765,7 @@ then
|
|||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
printf "%s\n" "yes" >&6; }
|
||||
PLATLIBDIR="$withval"
|
||||
BINLIBDEST='${exec_prefix}/${PLATLIBDIR}/python$(VERSION)'
|
||||
BINLIBDEST='${exec_prefix}/${PLATLIBDIR}/python$(VERSION)$(ABI_THREAD)'
|
||||
else
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
|
@ -24775,9 +24779,9 @@ fi
|
|||
|
||||
|
||||
if test x$PLATFORM_TRIPLET = x; then
|
||||
LIBPL='$(prefix)'"/${PLATLIBDIR}/python${VERSION}/config-${LDVERSION}"
|
||||
LIBPL='$(prefix)'"/${PLATLIBDIR}/python${VERSION}${ABI_THREAD}/config-${LDVERSION}"
|
||||
else
|
||||
LIBPL='$(prefix)'"/${PLATLIBDIR}/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
||||
LIBPL='$(prefix)'"/${PLATLIBDIR}/python${VERSION}${ABI_THREAD}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
||||
fi
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue