Return-Path: Delivered-To: apmail-jakarta-commons-user-archive@www.apache.org Received: (qmail 79120 invoked from network); 11 Jan 2005 02:13:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 11 Jan 2005 02:13:52 -0000 Received: (qmail 90736 invoked by uid 500); 11 Jan 2005 02:13:47 -0000 Delivered-To: apmail-jakarta-commons-user-archive@jakarta.apache.org Received: (qmail 90695 invoked by uid 500); 11 Jan 2005 02:13:46 -0000 Mailing-List: contact commons-user-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Users List" Reply-To: "Jakarta Commons Users List" Delivered-To: mailing list commons-user@jakarta.apache.org Received: (qmail 83570 invoked by uid 99); 11 Jan 2005 02:07:13 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=MIME_HEADER_CTYPE_ONLY X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Date: Mon, 10 Jan 2005 21:07:07 -0500 (EST) From: John Wehle Message-Id: <200501110207.j0B277ow016600@jwlab.FEITH.COM> To: commons-user@jakarta.apache.org Subject: [daemon] Patch for commons-daemon 20050103 to support Tru64 4.0F Content-Type: text X-Scanned-By: MIMEDefang 2.48 on 192.251.93.1 X-Archived: cashew.FEITH.COM X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N The enclosed patch allows commons-daemon to build on a Dec Alpha running Tru64 4.0F. Notes: 1) Compaq Tru64 requires: LD_LIBRARY_PATH=${JAVA_HOME}/jre/lib/alpha:${JAVA_HOME}/jre/lib/alpha/native_threads export LD_LIBRARY_PATH before invoking jsvc. -- John Wehle ------------------8<------------------------8<------------------------ *** src/native/unix/native/dso-dlfcn.c.ORIGINAL Mon Jan 3 08:13:54 2005 --- src/native/unix/native/dso-dlfcn.c Fri Jan 7 19:54:40 2005 *************** *** 20,25 **** --- 20,29 ---- #include + #ifndef RTLD_GLOBAL + # define RTLD_GLOBAL 0 + #endif + #ifdef OS_LINUX bool ld_library_path_set=false; #endif /* ifdef OS_LINUX */ *** src/native/unix/native/jsvc-unix.c.ORIGINAL Mon Jan 10 17:31:12 2005 --- src/native/unix/native/jsvc-unix.c Mon Jan 10 17:31:31 2005 *************** static void controller(int sig) { *** 226,233 **** /* * Return the address of the current signal handler and set the new one. */ ! static void * signal_set(int sig, void * newHandler) { ! void *hand; hand=signal(sig,newHandler); #ifdef SIG_ERR --- 226,233 ---- /* * Return the address of the current signal handler and set the new one. */ ! static void (*signal_set(int sig, void (*newHandler)(int)))(int) { ! void (*hand)(int); hand=signal(sig,newHandler); #ifdef SIG_ERR *** src/native/unix/support/apsupport.m4.ORIGINAL Mon Jan 3 08:13:54 2005 --- src/native/unix/support/apsupport.m4 Fri Jan 7 19:41:49 2005 *************** AC_DEFUN(AP_SUPPORTED_HOST,[ *** 81,87 **** LDFLAGS="-pthread $LDFLAGS" supported_os="freebsd" ;; ! osf5*) CFLAGS="$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED" LDFLAGS="$LDFLAGS -pthread" ;; --- 81,87 ---- LDFLAGS="-pthread $LDFLAGS" supported_os="freebsd" ;; ! osf4*|osf5*) CFLAGS="$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED" LDFLAGS="$LDFLAGS -pthread" ;; -- John ------------------------------------------------------------------------- | Feith Systems | Voice: 1-215-646-8000 | Email: john@feith.com | | John Wehle | Fax: 1-215-540-5495 | | ------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commons-user-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-user-help@jakarta.apache.org