traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Barry Warsaw 2010-10-18 17:09:07 +00:00
parent eebccfb10c
commit f040d7de94
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/python-config.in
View File

@ -1,4 +1,5 @@
#!@EXENAME@ #!@EXENAME@
# -*- python -*-
import getopt import getopt
import os import os
@ -45,7 +46,7 @@ for opt in opt_flags:
elif opt in ('--libs', '--ldflags'): elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split() 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 # add the prefix/lib/pythonX.Y/config dir, but only if there is no
# shared library in prefix/lib/. # shared library in prefix/lib/.
if opt == '--ldflags': if opt == '--ldflags':

2
Misc/python.pc.in
View File

@ -8,6 +8,6 @@ Description: Python library
Requires: Requires:
Version: @VERSION@ Version: @VERSION@
Libs.private: @LIBS@ Libs.private: @LIBS@
Libs: -L${libdir} -lpython@VERSION@ Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
Cflags: -I${includedir}/python@VERSION@ Cflags: -I${includedir}/python@VERSION@

4
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 85559 . # From configure.in Revision: 85656 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.67 for python 3.2. # Generated by GNU Autoconf 2.67 for python 3.2.
# #
@ -4679,7 +4679,7 @@ esac
$as_echo_n "checking LIBRARY... " >&6; } $as_echo_n "checking LIBRARY... " >&6; }
if test -z "$LIBRARY" if test -z "$LIBRARY"
then then
LIBRARY='libpython$(VERSION).a' LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5
$as_echo "$LIBRARY" >&6; } $as_echo "$LIBRARY" >&6; }

2
configure.in
View File

@ -585,7 +585,7 @@ AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY) AC_MSG_CHECKING(LIBRARY)
if test -z "$LIBRARY" if test -z "$LIBRARY"
then then
LIBRARY='libpython$(VERSION).a' LIBRARY='libpython$(VERSION)$(ABIFLAGS).a'
fi fi
AC_MSG_RESULT($LIBRARY) AC_MSG_RESULT($LIBRARY)