You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by bi...@apache.org on 2004/06/10 07:21:24 UTC
cvs commit: jakarta-commons/daemon/src/native/unix/support apsupport.m4
billbarker 2004/06/09 22:21:24
Modified: daemon/src/native/unix/native location.c
daemon/src/native/unix/support apsupport.m4
Log:
Patch to support Tru64/Alpha systems.
Fix for Bug #29465
Submitted By: Max Zinal Zlat0@mail.ru
Revision Changes Path
1.5 +9 -2 jakarta-commons/daemon/src/native/unix/native/location.c
Index: location.c
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/native/location.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- location.c 18 Mar 2004 17:28:33 -0000 1.4
+++ location.c 10 Jun 2004 05:21:24 -0000 1.5
@@ -37,6 +37,9 @@
#elif defined(OS_SYSV)
"/opt/java",
"/opt/java/jdk13",
+#elif defined(OS_TRU64)
+ "/usr/opt/java142",
+ "/usr/opt/java13",
#endif
NULL,
};
@@ -62,7 +65,7 @@
#elif defined(OS_CYGWIN)
"$JAVA_HOME/jre/bin/classic/jvm.dll", /* Sun JDK 1.3 */
"$JAVA_HOME/jre/bin/client/jvm.dll", /* Sun JDK 1.4 */
-#elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD) || defined(OS_SYSV) || defined(OS_FREEBSD)
+#elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD) || defined(OS_SYSV) || defined(OS_FREEBSD) || defined(OS_TRU64)
"$JAVA_HOME/jre/lib/" CPU "/classic/libjvm.so", /* Sun JDK 1.2 */
"$JAVA_HOME/jre/lib/" CPU "/client/libjvm.so", /* Sun JDK 1.3 */
"$JAVA_HOME/jre/lib/" CPU "/libjvm.so", /* Sun JDK */
@@ -88,6 +91,10 @@
"$JAVA_HOME/bin/classic/libjvm.so",
"$JAVA_HOME/bin/client/libjvm.so",
"$JAVA_HOME/bin/libjvm.so",
+ "$JAVA_HOME/jre/lib/" CPU "/fast64/libjvm.so",
+ "$JAVA_HOME/jre/lib/" CPU "/fast32/libjvm.so",
+ "$JAVA_HOME/lib/" CPU "/fast64/libjvm.so",
+ "$JAVA_HOME/lib/" CPU "/fast32/libjvm.so",
#endif
NULL,
};
1.5 +9 -1 jakarta-commons/daemon/src/native/unix/support/apsupport.m4
Index: apsupport.m4
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/support/apsupport.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apsupport.m4 27 Feb 2004 08:40:46 -0000 1.4
+++ apsupport.m4 10 Jun 2004 05:21:24 -0000 1.5
@@ -38,6 +38,10 @@
CFLAGS="$CFLAGS -DCPU=\\\"mips\\\""
supported_os="mips"
;;
+ alpha*)
+ CFLAGS="$CFLAGS -DCPU=\\\"alpha\\\""
+ supported_os="alpha"
+ ;;
*)
AC_MSG_RESULT([failed])
AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
@@ -74,6 +78,10 @@
CFLAGS="$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread"
LDFLAGS="-pthread $LDFLAGS"
supported_os="freebsd"
+ ;;
+ osf5*)
+ CFLAGS="$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED"
+ LDFLAGS="$LDFLAGS -pthread"
;;
*)
AC_MSG_RESULT([failed])
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org