mirror of https://github.com/python/cpython
bpo-43112: detect musl as a separate SOABI (GH-24502)
musl libc and gnu libc are not ABI compatible so we need set different SOABI for musl and not simply assume that all linux is linux-gnu. Replace linux-gnu with the detected os for the build from config.guess for linux-musl*.
This commit is contained in:
parent
24cc6411ad
commit
1f036ede59
|
@ -433,11 +433,11 @@ class TestSysConfig(unittest.TestCase):
|
|||
self.assertTrue('linux' in suffix, suffix)
|
||||
if re.match('(i[3-6]86|x86_64)$', machine):
|
||||
if ctypes.sizeof(ctypes.c_char_p()) == 4:
|
||||
self.assertTrue(suffix.endswith('i386-linux-gnu.so') or
|
||||
suffix.endswith('x86_64-linux-gnux32.so'),
|
||||
suffix)
|
||||
expected_suffixes = 'i386-linux-gnu.so', 'x86_64-linux-gnux32.so', 'i386-linux-musl.so'
|
||||
else: # 8 byte pointer size
|
||||
self.assertTrue(suffix.endswith('x86_64-linux-gnu.so'), suffix)
|
||||
expected_suffixes = 'x86_64-linux-gnu.so', 'x86_64-linux-musl.so'
|
||||
self.assertTrue(suffix.endswith(expected_suffixes),
|
||||
f'unexpected suffix {suffix!r}')
|
||||
|
||||
@unittest.skipUnless(sys.platform == 'darwin', 'OS X-specific test')
|
||||
def test_osx_ext_suffix(self):
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Detect musl libc as a separate SOABI (tagged as ``linux-musl``).
|
|
@ -6090,6 +6090,11 @@ EOF
|
|||
|
||||
if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
|
||||
PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '`
|
||||
case "$build_os" in
|
||||
linux-musl*)
|
||||
PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'`
|
||||
;;
|
||||
esac
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_TRIPLET" >&5
|
||||
$as_echo "$PLATFORM_TRIPLET" >&6; }
|
||||
else
|
||||
|
|
|
@ -981,6 +981,11 @@ EOF
|
|||
|
||||
if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
|
||||
PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '`
|
||||
case "$build_os" in
|
||||
linux-musl*)
|
||||
PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'`
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT([$PLATFORM_TRIPLET])
|
||||
else
|
||||
AC_MSG_RESULT([none])
|
||||
|
|
Loading…
Reference in New Issue