Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64.

I suppose this could be backported if anyone cares.

diff --git a/Misc/ACKS b/Misc/ACKS
index 2606dffa1394b505c0d73e440a752ac6c4eca04f..57b85e5291c77dba6474c593b1dc04efbba832f8 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -189,6 +189,7 @@ Carey Evans
 Stephen D Evans
 Tim Everett
 Paul Everitt
+David Everly
 Greg Ewing
 Martijn Faassen
 Andreas Faerber

diff --git a/Misc/NEWS b/Misc/NEWS
index 679bd3060e2e46607cc70b649f1bb9906aad19da..4f9083ce42089826c8d538102e23983d58c9690e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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

diff --git a/configure b/configure
index f829580dffff181e25b9f7f9fc7f95d51a12492c..8676dab1601f868bb21e49ea8aa34ad2ee8014fe 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 26c881f0935c638460b5bc07ed7bf3ed672bca4b..a7c50bd013d782257637644114cff6a7536c5e4e 100644 (file)
--- 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 df3c1cd1efce3e532a66d4f870e77ffe35364c5f..1468bf62d98987d0f8b16317911248d61e68c2d6 100644 (file)
--- 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