Skip to content

Commit f040d7d

Browse files
committed
One more change for issue 9807, by Matthias Klose.
This adds $ABIFLAGS to the static library, since it should match the shared library name. Also, include the abiflags in python-config --libs.
1 parent eebccfb commit f040d7d

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Misc/python-config.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!@EXENAME@
2+
# -*- python -*-
23

34
import getopt
45
import os
@@ -45,7 +46,7 @@ for opt in opt_flags:
4546

4647
elif opt in ('--libs', '--ldflags'):
4748
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
48-
libs.append('-lpython'+pyver)
49+
libs.append('-lpython' + pyver + sys.abiflags)
4950
# add the prefix/lib/pythonX.Y/config dir, but only if there is no
5051
# shared library in prefix/lib/.
5152
if opt == '--ldflags':

Misc/python.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ Description: Python library
88
Requires:
99
Version: @VERSION@
1010
Libs.private: @LIBS@
11-
Libs: -L${libdir} -lpython@VERSION@
11+
Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
1212
Cflags: -I${includedir}/python@VERSION@
1313

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 85559 .
2+
# From configure.in Revision: 85656 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.67 for python 3.2.
55
#
@@ -4679,7 +4679,7 @@ esac
46794679
$as_echo_n "checking LIBRARY... " >&6; }
46804680
if test -z "$LIBRARY"
46814681
then
4682-
LIBRARY='libpython$(VERSION).a'
4682+
LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
46834683
fi
46844684
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5
46854685
$as_echo "$LIBRARY" >&6; }

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ AC_SUBST(LIBRARY)
585585
AC_MSG_CHECKING(LIBRARY)
586586
if test -z "$LIBRARY"
587587
then
588-
LIBRARY='libpython$(VERSION).a'
588+
LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
589589
fi
590590
AC_MSG_RESULT($LIBRARY)
591591

0 commit comments

Comments
 (0)