[Python-checkins] python/dist/src configure.in, 1.472,
1.473 configure, 1.459, 1.460
perky at users.sourceforge.net
perky at users.sourceforge.net
Tue Oct 26 11:53:49 CEST 2004
Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27686
Modified Files:
configure.in configure
Log Message:
Patch #1044395: Allow configure option --enable-shared in FreeBSD.
(Submitted by James William Pye, Patch revised by Jiwon Seo)
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -d -r1.472 -r1.473
--- configure.in 13 Oct 2004 15:30:55 -0000 1.472
+++ configure.in 26 Oct 2004 09:53:40 -0000 1.473
@@ -557,10 +557,15 @@
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
- Linux*|GNU*|NetBSD*)
+ Linux*|GNU*|NetBSD*|FreeBSD*)
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ case $ac_sys_system in
+ FreeBSD*)
+ SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
+ ;;
+ esac
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
@@ -1345,7 +1350,7 @@
OpenBSD*|FreeBSD*)
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
then
- LDSHARED="cc -shared ${LDFLAGS}"
+ LDSHARED="$CC -shared ${LDFLAGS}"
else
LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;;
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -d -r1.459 -r1.460
--- configure 13 Oct 2004 15:30:45 -0000 1.459
+++ configure 26 Oct 2004 09:53:40 -0000 1.460
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.471 .
+# From configure.in Revision: 1.472 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.4.
#
@@ -3392,10 +3392,15 @@
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
- Linux*|GNU*|NetBSD*)
+ Linux*|GNU*|NetBSD*|FreeBSD*)
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ case $ac_sys_system in
+ FreeBSD*)
+ SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
+ ;;
+ esac
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
@@ -10332,7 +10337,7 @@
OpenBSD*|FreeBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
then
- LDSHARED="cc -shared ${LDFLAGS}"
+ LDSHARED="$CC -shared ${LDFLAGS}"
else
LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;;
More information about the Python-checkins
mailing list