Commit 58e28887 authored by Neal Norwitz's avatar Neal Norwitz

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

I suppose this could be backported if anyone cares.
parent 5ef92244
...@@ -189,6 +189,7 @@ Carey Evans ...@@ -189,6 +189,7 @@ Carey Evans
Stephen D Evans Stephen D Evans
Tim Everett Tim Everett
Paul Everitt Paul Everitt
David Everly
Greg Ewing Greg Ewing
Martijn Faassen Martijn Faassen
Andreas Faerber Andreas Faerber
......
...@@ -81,6 +81,8 @@ Library ...@@ -81,6 +81,8 @@ Library
Build Build
----- -----
- Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64.
- Patch #1471883: Add --enable-universalsdk. - Patch #1471883: Add --enable-universalsdk.
C API C API
......
#! /bin/sh #! /bin/sh
# From configure.in Revision: 45995 . # From configure.in Revision: 46010 .
# 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.5. # Generated by GNU Autoconf 2.59 for python 2.5.
# #
...@@ -3387,7 +3387,14 @@ _ACEOF ...@@ -3387,7 +3387,14 @@ _ACEOF
INSTSONAME="$LDLIBRARY".$SOVERSION INSTSONAME="$LDLIBRARY".$SOVERSION
;; ;;
hp*|HP*) 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)' BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH} RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH}
;; ;;
...@@ -10869,7 +10876,12 @@ echo $ECHO_N "checking SO... $ECHO_C" >&6 ...@@ -10869,7 +10876,12 @@ echo $ECHO_N "checking SO... $ECHO_C" >&6
if test -z "$SO" if test -z "$SO"
then then
case $ac_sys_system in case $ac_sys_system in
hp*|HP*) SO=.sl;; hp*|HP*)
case `uname -m` in
ia64) SO=.so;;
*) SO=.sl;;
esac
;;
CYGWIN*) SO=.dll;; CYGWIN*) SO=.dll;;
*) SO=.so;; *) SO=.so;;
esac esac
...@@ -10887,6 +10899,11 @@ else ...@@ -10887,6 +10899,11 @@ else
fi fi
echo "$as_me:$LINENO: result: $SO" >&5 echo "$as_me:$LINENO: result: $SO" >&5
echo "${ECHO_T}$SO" >&6 echo "${ECHO_T}$SO" >&6
cat >>confdefs.h <<_ACEOF
#define SHLIB_EXT "$SO"
_ACEOF
# LDSHARED is the ld *command* used to create shared library # LDSHARED is the ld *command* used to create shared library
# -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5 # -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5
# (Shared libraries in this instance are shared modules to be loaded into # (Shared libraries in this instance are shared modules to be loaded into
......
...@@ -611,7 +611,14 @@ if test $enable_shared = "yes"; then ...@@ -611,7 +611,14 @@ if test $enable_shared = "yes"; then
INSTSONAME="$LDLIBRARY".$SOVERSION INSTSONAME="$LDLIBRARY".$SOVERSION
;; ;;
hp*|HP*) 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)' BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH} RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH}
;; ;;
...@@ -1359,7 +1366,12 @@ AC_MSG_CHECKING(SO) ...@@ -1359,7 +1366,12 @@ AC_MSG_CHECKING(SO)
if test -z "$SO" if test -z "$SO"
then then
case $ac_sys_system in case $ac_sys_system in
hp*|HP*) SO=.sl;; hp*|HP*)
case `uname -m` in
ia64) SO=.so;;
*) SO=.sl;;
esac
;;
CYGWIN*) SO=.dll;; CYGWIN*) SO=.dll;;
*) SO=.so;; *) SO=.so;;
esac esac
...@@ -1376,6 +1388,7 @@ else ...@@ -1376,6 +1388,7 @@ else
sleep 10 sleep 10
fi fi
AC_MSG_RESULT($SO) 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 # LDSHARED is the ld *command* used to create shared library
# -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5 # -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5
# (Shared libraries in this instance are shared modules to be loaded into # (Shared libraries in this instance are shared modules to be loaded into
......
...@@ -754,6 +754,9 @@ ...@@ -754,6 +754,9 @@
/* Define if setpgrp() must be called as setpgrp(0, 0). */ /* Define if setpgrp() must be called as setpgrp(0, 0). */
#undef SETPGRP_HAVE_ARG #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 */ /* Define if i>>j for signed int i does not extend the sign bit when i < 0 */
#undef SIGNED_RIGHT_SHIFT_ZERO_FILLS #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment