Patch #1044395: Allow configure option --enable-shared in FreeBSD.

(Submitted by James William Pye, Patch revised by Jiwon Seo)
This commit is contained in:
Hye-Shik Chang 2004-10-26 09:53:46 +00:00
parent 182ac85147
commit 337614993e
3 changed files with 17 additions and 7 deletions

View File

@ -59,13 +59,13 @@ Library
- Bug #1017553: fix bug in tarfile.filemode() - Bug #1017553: fix bug in tarfile.filemode()
- Bug #737473: fix bug that old source code is shown in tracebacks even if - Patch #737473: fix bug that old source code is shown in tracebacks even if
the source code is updated and reloaded. the source code is updated and reloaded.
Build Build
----- -----
... - Patch #1044395: --enable-shared is allowed in FreeBSD also.
C API C API
----- -----

11
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.471 . # From configure.in Revision: 1.472 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.4. # Generated by GNU Autoconf 2.59 for python 2.4.
# #
@ -3392,10 +3392,15 @@ _ACEOF
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION INSTSONAME="$LDLIBRARY".$SOVERSION
;; ;;
Linux*|GNU*|NetBSD*) Linux*|GNU*|NetBSD*|FreeBSD*)
LDLIBRARY='libpython$(VERSION).so' LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)' BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} 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 INSTSONAME="$LDLIBRARY".$SOVERSION
;; ;;
hp*|HP*) hp*|HP*)
@ -10332,7 +10337,7 @@ then
OpenBSD*|FreeBSD*) OpenBSD*|FreeBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
then then
LDSHARED="cc -shared ${LDFLAGS}" LDSHARED="$CC -shared ${LDFLAGS}"
else else
LDSHARED="ld -Bshareable ${LDFLAGS}" LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;; fi;;

View File

@ -557,10 +557,15 @@ if test $enable_shared = "yes"; then
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION INSTSONAME="$LDLIBRARY".$SOVERSION
;; ;;
Linux*|GNU*|NetBSD*) Linux*|GNU*|NetBSD*|FreeBSD*)
LDLIBRARY='libpython$(VERSION).so' LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)' BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} 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 INSTSONAME="$LDLIBRARY".$SOVERSION
;; ;;
hp*|HP*) hp*|HP*)
@ -1345,7 +1350,7 @@ then
OpenBSD*|FreeBSD*) OpenBSD*|FreeBSD*)
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]] if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
then then
LDSHARED="cc -shared ${LDFLAGS}" LDSHARED="$CC -shared ${LDFLAGS}"
else else
LDSHARED="ld -Bshareable ${LDFLAGS}" LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;; fi;;