diff options
| author | Hye-Shik Chang <hyeshik@gmail.com> | 2004-10-26 09:53:46 (GMT) |
|---|---|---|
| committer | Hye-Shik Chang <hyeshik@gmail.com> | 2004-10-26 09:53:46 (GMT) |
| commit | 337614993e6f329143e5a68349b62f0a43114ac9 (patch) | |
| tree | 5a2e1a95f3615bf9b80813a455f479962ae524c2 | |
| parent | 182ac8514726402451a90fd59c9bf427f8071365 (diff) | |
| download | cpython-337614993e6f329143e5a68349b62f0a43114ac9.zip cpython-337614993e6f329143e5a68349b62f0a43114ac9.tar.gz cpython-337614993e6f329143e5a68349b62f0a43114ac9.tar.bz2 | |
Patch #1044395: Allow configure option --enable-shared in FreeBSD.
(Submitted by James William Pye, Patch revised by Jiwon Seo)
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.in | 9 |
3 files changed, 17 insertions, 7 deletions
@@ -59,13 +59,13 @@ Library - 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. Build ----- -... +- Patch #1044395: --enable-shared is allowed in FreeBSD also. C API ----- @@ -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 @@ _ACEOF 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 @@ then 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;; diff --git a/configure.in b/configure.in index 981d2ba..cc98881 100644 --- a/configure.in +++ b/configure.in @@ -557,10 +557,15 @@ if test $enable_shared = "yes"; then 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 @@ then 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;; |