mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
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.
This commit is contained in:
parent
eebccfb10c
commit
f040d7de94
|
@ -1,4 +1,5 @@
|
|||
#!@EXENAME@
|
||||
# -*- python -*-
|
||||
|
||||
import getopt
|
||||
import os
|
||||
|
@ -45,7 +46,7 @@ for opt in opt_flags:
|
|||
|
||||
elif opt in ('--libs', '--ldflags'):
|
||||
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
|
||||
libs.append('-lpython'+pyver)
|
||||
libs.append('-lpython' + pyver + sys.abiflags)
|
||||
# add the prefix/lib/pythonX.Y/config dir, but only if there is no
|
||||
# shared library in prefix/lib/.
|
||||
if opt == '--ldflags':
|
||||
|
|
|
@ -8,6 +8,6 @@ Description: Python library
|
|||
Requires:
|
||||
Version: @VERSION@
|
||||
Libs.private: @LIBS@
|
||||
Libs: -L${libdir} -lpython@VERSION@
|
||||
Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
|
||||
Cflags: -I${includedir}/python@VERSION@
|
||||
|
||||
|
|
4
configure
vendored
4
configure
vendored
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 85559 .
|
||||
# From configure.in Revision: 85656 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.67 for python 3.2.
|
||||
#
|
||||
|
@ -4679,7 +4679,7 @@ esac
|
|||
$as_echo_n "checking LIBRARY... " >&6; }
|
||||
if test -z "$LIBRARY"
|
||||
then
|
||||
LIBRARY='libpython$(VERSION).a'
|
||||
LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5
|
||||
$as_echo "$LIBRARY" >&6; }
|
||||
|
|
|
@ -585,7 +585,7 @@ AC_SUBST(LIBRARY)
|
|||
AC_MSG_CHECKING(LIBRARY)
|
||||
if test -z "$LIBRARY"
|
||||
then
|
||||
LIBRARY='libpython$(VERSION).a'
|
||||
LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
|
||||
fi
|
||||
AC_MSG_RESULT($LIBRARY)
|
||||
|
||||
|
|
Loading…
Reference in a new issue