You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2011/04/18 12:09:37 UTC
svn commit: r1094449 -
/commons/sandbox/runtime/trunk/src/main/native/configure
Author: mturk
Date: Mon Apr 18 10:09:37 2011
New Revision: 1094449
URL: http://svn.apache.org/viewvc?rev=1094449&view=rev
Log:
Fix HP-UX config. Platform requires LD_PRELOAD, so not fully supported
Modified:
commons/sandbox/runtime/trunk/src/main/native/configure
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=1094449&r1=1094448&r2=1094449&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Mon Apr 18 10:09:37 2011
@@ -586,9 +586,9 @@ case "$host-$cctype" in
varadds ldflags -lpthread -ldl
varadds shflags -G -KPIC -dy
if [ ".$has_shared_version" = .yes ]; then
- varadds lddname -h 'lib??(NAME)??(SO).??(VERSION_MAJOR)'
+ varadds lddname '-Wl,-h,lib??(NAME)??(SO).??(VERSION_MAJOR)'
else
- varadds lddname -h 'lib??(NAME)??(SO)'
+ varadds lddname '-Wl,-h,lib??(NAME)??(SO)'
fi
varadds ldrpath '-R:??(PREFIX)/??(LIBDIR):.'
test ".$java_platform_inc" = . && java_platform_inc=linux
@@ -630,29 +630,31 @@ case "$host-$cctype" in
varadds ldflags -lrt -ldl -lthread -lsendfile -lsocket -lnsl
varadds shflags -G -KPIC -dy
if [ ".$has_shared_version" = .yes ]; then
- varadds lddname -h 'lib??(NAME)??(SO).??(VERSION_MAJOR)'
+ varadds lddname '-Wl,-h,lib??(NAME)??(SO).??(VERSION_MAJOR)'
else
- varadds lddname -h 'lib??(NAME)??(SO)'
+ varadds lddname '-Wl,-h,lib??(NAME)??(SO)'
fi
varadds ldrpath '-R:??(PREFIX)/??(LIBDIR):.'
test ".$java_platform_inc" = . && java_platform_inc=solaris
;;
hpux-cc )
- varadds cppopts -D_HPUX_SOURCE -DHPUX11=$r
+ varadds cppopts -D_HPUX_SOURCE
varadds ccflags -Ae +O2 -z
varadds ccshare +Z
varadds asflags -c +Z -D$mcpu
varadds ldflags -lrt -lpthread -ldld -lm
varadds asflags +Z
- if [ ".$mach" = .parisc ]; then
- so=.sl
- sx=.sl
- fi
+ case "$mach" in
+ parisc* )
+ so=.sl
+ sx=.sl
+ ;;
+ esac
varadds shflags +Z -b
if [ ".$has_shared_version" = .yes ]; then
- varadds lddname +h 'lib??(NAME)??(SO).??(VERSION_MAJOR)'
+ varadds lddname '-Wl,+h,lib??(NAME)??(SO).??(VERSION_MAJOR)'
else
- varadds lddname +h 'lib??(NAME)??(SO)'
+ varadds lddname '-Wl,+h,lib??(NAME)??(SO)'
fi
test ".$java_platform_inc" = . && java_platform_inc=hp-ux
;;
@@ -662,7 +664,7 @@ case "$host-$cctype" in
varadds ccshare -fPIC
varadds ldflags -lrt -lpthreads -lnsl
varadds shflags -shared -fPIC
- varadds lddname -Wl,-soname '-Wl,??@' -Wl,-brtl
+ varadds lddname '-Wl,-soname,??@' -Wl,-brtl
varadds ldrpath '-Wl,-rpath,??(PREFIX)/??(LIBDIR):????ORIGIN'
echo "Warning : WORK IN PROGRESS"
;;
@@ -671,7 +673,7 @@ case "$host-$cctype" in
exit 1
;;
esac
-
+makedeps="$cc -MM"
test ".$optlibs" != . && varadds ldflags $optlibs
case "$host-$cctype" in
*-gcc )
@@ -693,7 +695,6 @@ case "$host-$cctype" in
varadds ccflags -fvisibility=hidden
fi
varadds ccflags -fstrict-aliasing
- makedeps="$cc -MM"
if [ ".$has_zlib_asm" = .yes ]; then
if [ ".$mach" = .i386 ]; then
varadds cppopts -DASMV
@@ -705,9 +706,6 @@ case "$host-$cctype" in
fi
fi
;;
- *-cc )
- makedeps="$cc -MM"
- ;;
esac
case "$host$bits-$cc" in