You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apache-bugdb@apache.org by Dave MacLachlan <da...@paradigmdev.com> on 1998/09/22 21:02:51 UTC

os-other/3043: Getting Apache ported to Rhapsody DR2

>Number:         3043
>Category:       os-other
>Synopsis:       Getting Apache ported to Rhapsody DR2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    apache
>State:          open
>Class:          change-request
>Submitter-Id:   apache
>Arrival-Date:   Tue Sep 22 12:10:01 PDT 1998
>Last-Modified:
>Originator:     davem@paradigmdev.com
>Organization:
apache
>Release:        Apache1.3.1
>Environment:
Rhapsody Utopia 5.1 Rhapsody Operating System Release 5.1: Fri Apr 17 13:29:35 PDT 1998; root(rcbuilder):Objects/kernel-105.6.obj~2/RELEASE_PPC Copyright (c) 1988-1995,1997 Apple Computer, Inc. All Rights Reserved.  Power Macintosh
>Description:
*** origapache_1.3.1/src/Configure      Sat Jul 18 03:51:52 1998
--- apache_1.3.1/src/Configure  Wed Sep 16 17:01:54 1998
***************
*** 496,501 ****
--- 496,511 ----
        LDFLAGS_SHLIB='-dynamiclib -undefined warning'
        DEF_WANTHSREGEX=yes
        ;;
+       *-apple-rhapsody*)
+       OS='Rhapsody'
+       CC='cc'
+       OPTIM='-O'
+       CFLAGS="$CFLAGS -DRHAPSODY"
+       CFLAGS_SHLIB='-dynamic -fno-common'
+       LD_SHLIB='cc'
+       LDFLAGS_SHLIB='-dynamiclib -undefined warning'
+       DEF_WANTHSREGEX=yes
+       ;;
      *-dec-osf*)
        OS='DEC OSF/1'
        CFLAGS="$CFLAGS -DOSF1"


*** origapache_1.3.1/src/helpers/GuessOS        Mon Jun 29 05:21:04 1998
--- apache_1.3.1/src/helpers/GuessOS    Thu Sep 17 09:17:59 1998
***************
*** 230,236 ****
      *:4.0:2:*)
        echo "whatever-unisys-sysv4"; exit 0;
        ;;
! 
  esac
  
  #
--- 230,243 ----
      *:4.0:2:*)
        echo "whatever-unisys-sysv4"; exit 0;
        ;;
!     
!     Rhapsody:*:*:*)
!       case "${MACHINE}" in
!               "Power Macintosh")
!                       MACHINE=powerpc;;
!       esac
!       echo "${MACHINE}-apple-rhapsody${RELEASE}"; exit 0;
!       ;;
  esac
  
  #


*** origapache_1.3.1/configure  Sun Jul 12 02:25:46 1998
--- apache_1.3.1/configure      Sun Sep 20 15:42:27 1998
***************
*** 140,165 ****
  ##
  
  #   default paths
! prefix='/usr/local/apache'
! exec_prefix='$prefix'
! bindir='$exec_prefix/bin'
! sbindir='$exec_prefix/sbin'
! libexecdir='$exec_prefix/libexec'
! mandir='$prefix/man'
! sysconfdir='$prefix/etc'
! datadir='$prefix/share'
! includedir='$prefix/include'
! localstatedir='$prefix/var'
! runtimedir='$localstatedir/run'
! logfiledir='$localstatedir/log'
! proxycachedir='$localstatedir/proxy'
  
- #   customization flags for
- #   automatic "apache" suffix 
- customized_sysconfdir=0
- customized_datadir=0
- customized_localstatedir=0
- customized_includedir=0
  
  #   check and debug
  layout=0
--- 140,189 ----
  ##
  
  #   default paths
! SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
! if [ "${SYSTEM}" = "Rhapsody" ]; then
!       prefix='/usr/apache'
!       exec_prefix='$prefix'
!       bindir='$exec_prefix/bin'
!       sbindir='$exec_prefix/sbin'
!       libexecdir='$exec_prefix/libexec'
!       mandir='/System/Documentation/ManPages/'
!       sysconfdir='/Local/Library/WebServer/Configuration'
!       datadir='/Local/Library/WebServer/Documents'
!       includedir='$prefix/include'
!       localstatedir='/Local/Library/WebServer/Logs'
!       runtimedir='$localstatedir/run'
!       logfiledir='/Local/Library/WebServer/Logs'
!       proxycachedir='$localstatedir/proxy'
!       #   customization flags for
!       #   automatic "apache" suffix 
!       customized_sysconfdir=1
!       customized_datadir=1
!       customized_localstatedir=1
!       customized_includedir=0
! else
!       prefix='/usr/local/apache'
!       exec_prefix='$prefix'
!       bindir='$exec_prefix/bin'
!       sbindir='$exec_prefix/sbin'
!       libexecdir='$exec_prefix/libexec'
!       mandir='$prefix/man'
!       sysconfdir='$prefix/etc'
!       datadir='$prefix/share'
!       includedir='$prefix/include'
!       localstatedir='$prefix/var'
!       runtimedir='$localstatedir/run'
!       logfiledir='$localstatedir/log'
!       proxycachedir='$localstatedir/proxy'
!       #   customization flags for
!       #   automatic "apache" suffix 
!       customized_sysconfdir=0
!       customized_datadir=0
!       customized_localstatedir=0
!       customized_includedir=0
! fi
! 
  
  
  #   check and debug
  layout=0


*** origapache_1.3.1/src/include/ap_config.h    Sat Jul 18 08:30:43 1998
--- apache_1.3.1/src/include/ap_config.h        Sun Sep 20 10:35:33 1998
***************
*** 358,363 ****
--- 358,373 ----
  #define NO_USE_SIGACTION
  #define HAVE_SYSLOG 1
  
+ #elif defined(RHAPSODY)
+ 
+ #define HAVE_GMTOFF 1
+ #undef HAVE_MMAP
+ #undef NO_KILLPG
+ #define HAVE_SYSLOG 1
+ #define USE_LONGJMP
+ #define NO_USE_SIGACTION
+ #define NO_LINGCLOSE
+ 
  #elif defined(LINUX)
  
  #if LINUX > 1
***************
*** 812,818 ****
   * means.  In particular it's missing inline and the __attribute__
   * stuff.  So we hack around it.  PR#1613. -djg
   */
! #if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 7 || defined(NEXT)
  #define ap_inline
  #define __attribute__(__x)
  #define ENUM_BITFIELD(e,n,w)  signed int n : w
--- 822,828 ----
   * means.  In particular it's missing inline and the __attribute__
   * stuff.  So we hack around it.  PR#1613. -djg
   */
! #if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 7 || defined(NEXT) || defined(RHAPSODY)
  #define ap_inline
  #define __attribute__(__x)
  #define ENUM_BITFIELD(e,n,w)  signed int n : w
>How-To-Repeat:

>Fix:
The patches above get Apaceh to compile and it appears to work on my Rhapsody box. It will set up the paths the way that Apple had them set up (basically) when they released Rpahsody DR2.

Please let me know if you need anything else.

Cheers,
Dave
>Audit-Trail:
>Unformatted:
[In order for any reply to be added to the PR database, ]
[you need to include <ap...@Apache.Org> in the Cc line ]
[and leave the subject line UNCHANGED.  This is not done]
[automatically because of the potential for mail loops. ]
[If you do not include this Cc, your reply may be ig-   ]
[nored unless you are responding to an explicit request ]
[from a developer.                                      ]
[Reply only with text; DO NOT SEND ATTACHMENTS!         ]