Author: mturk
Date: Mon Nov 7 14:23:05 2011
New Revision: 1198743
URL: http://svn.apache.org/viewvc?rev=1198743&view=rev
Log:
DAEMON-227, DAEMON-228: Fix hu-ux builds for multiple CPU's
Modified:
commons/proper/daemon/trunk/RELEASE-NOTES.txt
commons/proper/daemon/trunk/src/native/unix/native/location.c
commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4
Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=1198743&r1=1198742&r2=1198743&view=diff
==============================================================================
--- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Mon Nov 7 14:23:05 2011
@@ -81,7 +81,7 @@ NEW FEATURES:
BUG FIXES:
1.0.8: DAEMON-195, DAEMON-215, DAEMON-218, DAEMON-219, DAEMON-220, DAEMON-222,
- DAEMON-223, DAEMON-224
+ DAEMON-223, DAEMON-224, DAEMON-227, DAEMON-228
1.0.7: DAEMON-211, DAEMON-214
Modified: commons/proper/daemon/trunk/src/native/unix/native/location.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/location.c?rev=1198743&r1=1198742&r2=1198743&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/location.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/location.c Mon Nov 7
14:23:05 2011
@@ -46,6 +46,8 @@ char *location_home[] = {
"/usr/opt/java142",
"/usr/opt/java13",
#elif defined(OS_HPUX)
+ "/opt/java6",
+ "/opt/java1.5",
"/opt/java1.4",
"/opt/java1.3",
#endif
@@ -113,10 +115,10 @@ char *location_jvm_default[] = {
"$JAVA_HOME/lib/" CPU "/fast64/libjvm.so",
"$JAVA_HOME/lib/" CPU "/fast32/libjvm.so",
#elif defined(OS_HPUX)
- "$JAVA_HOME/jre/lib/" CPU "/server/libjvm.sl",
- "$JAVA_HOME/jre/lib/" CPU "/client/libjvm.sl",
- "$JAVA_HOME/jre/lib/" CPU "/hotspot/libjvm.sl",
- "$JAVA_HOME/jre/lib/" CPU "/classic/libjvm.sl",
+ "$JAVA_HOME/jre/lib/" CPU "/server/libjvm." SO_EXT,
+ "$JAVA_HOME/jre/lib/" CPU "/client/libjvm." SO_EXT,
+ "$JAVA_HOME/jre/lib/" CPU "/hotspot/libjvm." SO_EXT,
+ "$JAVA_HOME/jre/lib/" CPU "/classic/libjvm." SO_EXT,
#endif
"/usr/lib/libgcj.so.7", /* gcc java libraries */
"/usr/lib/libgcj.so.6",
Modified: commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4?rev=1198743&r1=1198742&r2=1198743&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 (original)
+++ commons/proper/daemon/trunk/src/native/unix/support/apsupport.m4 Mon Nov 7
14:23:05 2011
@@ -60,7 +60,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
CFLAGS="$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED"
LDFLAGS="$LDFLAGS -pthread"
;;
- hpux11*)
+ hpux*)
CFLAGS="$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN"
LDFLAGS="$LDFLAGS -pthread"
LIBS="$LIBS -lpthread"
@@ -83,7 +83,12 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
HOST_CPU=$host_cpu;;
i?86)
- CFLAGS="$CFLAGS -DCPU=\\\"i386\\\""
+ if [ $supported_os = hp-ux]
+ then
+ CFLAGS="$CFLAGS -milp32 -DCPU=\\\"IA64N\\\" -DSO_EXT=\\\"so\\\""
+ else
+ CFLAGS="$CFLAGS -DCPU=\\\"i386\\\""
+ fi
HOST_CPU=i386;;
x86_64 | amd64)
CFLAGS="$CFLAGS -DCPU=\\\"amd64\\\""
@@ -104,17 +109,22 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
supported_os="alpha"
HOST_CPU=alpha;;
hppa2.0w)
- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0W\\\""
+ CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0W\\\" -DSO_EXT=\\\"sl\\\""
HOST_CPU=PA_RISC2.0W;;
hppa2.0)
- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0\\\""
+ CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0\\\" -DSO_EXT=\\\"sl\\\""
HOST_CPU=PA_RISC2.0;;
mipsel)
CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\""
supported_os="mipsel"
HOST_CPU=mipsel;;
ia64)
- CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
+ if [ $supported_os = hp-ux]
+ then
+ CFLAGS="$CFLAGS -mlp64 -DCPU=\\\"IA64W\\\" -DSO_EXT=\\\"so\\\""
+ else
+ CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
+ endif
HOST_CPU=ia64;;
s390)
CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
