diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-05-19 07:00:58 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-05-19 07:00:58 (GMT) |
| commit | 58e28887d54315fafd918a7a38a037e5b77fcc9a (patch) | |
| tree | 0b306fc455610e970d89a3df0229505e879104d3 | |
| parent | 5ef922447c3dd0f9b306b4fde59481b4d4eaeaa3 (diff) | |
| download | cpython-58e28887d54315fafd918a7a38a037e5b77fcc9a.zip cpython-58e28887d54315fafd918a7a38a037e5b77fcc9a.tar.gz cpython-58e28887d54315fafd918a7a38a037e5b77fcc9a.tar.bz2 | |
Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64.
I suppose this could be backported if anyone cares.
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rwxr-xr-x | configure | 23 | ||||
| -rw-r--r-- | configure.in | 17 | ||||
| -rw-r--r-- | pyconfig.h.in | 3 |
5 files changed, 41 insertions, 5 deletions
@@ -189,6 +189,7 @@ Carey Evans Stephen D Evans Tim Everett Paul Everitt +David Everly Greg Ewing Martijn Faassen Andreas Faerber @@ -81,6 +81,8 @@ Library Build ----- +- Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64. + - Patch #1471883: Add --enable-universalsdk. C API @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 45995 . +# From configure.in Revision: 46010 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for python 2.5. # @@ -3387,7 +3387,14 @@ _ACEOF INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) - LDLIBRARY='libpython$(VERSION).sl' + case `uname -m` in + ia64) + LDLIBRARY='libpython$(VERSION).so' + ;; + *) + LDLIBRARY='libpython$(VERSION).sl' + ;; + esac BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH} ;; @@ -10869,7 +10876,12 @@ echo $ECHO_N "checking SO... $ECHO_C" >&6 if test -z "$SO" then case $ac_sys_system in - hp*|HP*) SO=.sl;; + hp*|HP*) + case `uname -m` in + ia64) SO=.so;; + *) SO=.sl;; + esac + ;; CYGWIN*) SO=.dll;; *) SO=.so;; esac @@ -10887,6 +10899,11 @@ else fi echo "$as_me:$LINENO: result: $SO" >&5 echo "${ECHO_T}$SO" >&6 + +cat >>confdefs.h <<_ACEOF +#define SHLIB_EXT "$SO" +_ACEOF + # LDSHARED is the ld *command* used to create shared library # -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5 # (Shared libraries in this instance are shared modules to be loaded into diff --git a/configure.in b/configure.in index 26c881f..a7c50bd 100644 --- a/configure.in +++ b/configure.in @@ -611,7 +611,14 @@ if test $enable_shared = "yes"; then INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) - LDLIBRARY='libpython$(VERSION).sl' + case `uname -m` in + ia64) + LDLIBRARY='libpython$(VERSION).so' + ;; + *) + LDLIBRARY='libpython$(VERSION).sl' + ;; + esac BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH} ;; @@ -1359,7 +1366,12 @@ AC_MSG_CHECKING(SO) if test -z "$SO" then case $ac_sys_system in - hp*|HP*) SO=.sl;; + hp*|HP*) + case `uname -m` in + ia64) SO=.so;; + *) SO=.sl;; + esac + ;; CYGWIN*) SO=.dll;; *) SO=.so;; esac @@ -1376,6 +1388,7 @@ else sleep 10 fi AC_MSG_RESULT($SO) +AC_DEFINE_UNQUOTED(SHLIB_EXT, "$SO", [Define this to be extension of shared libraries (including the dot!).]) # LDSHARED is the ld *command* used to create shared library # -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5 # (Shared libraries in this instance are shared modules to be loaded into diff --git a/pyconfig.h.in b/pyconfig.h.in index df3c1cd..1468bf6 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -754,6 +754,9 @@ /* Define if setpgrp() must be called as setpgrp(0, 0). */ #undef SETPGRP_HAVE_ARG +/* Define this to be extension of shared libraries (including the dot!). */ +#undef SHLIB_EXT + /* Define if i>>j for signed int i does not extend the sign bit when i < 0 */ #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS |