From: SHIROYAMA Takayuki <psi@...>
Date: 2000-04-23T02:10:17+09:00
Subject: [ruby-dev:9608] ruby1.4.4 for MacOS X patch


しろやまです。御無沙汰しております。

MacOS X DP3で ruby-1.4.4の動作確認をしましたので、
パッチをお送りします。

見て分かります通り、従来の powerpc-apple-rhapsody
(MacOS X Server)に加えてpowerpc-apple-macos10.0
をconfigureやextmk.inで認識する用にしただけです。

旧来のMacOS8/9との名称の衝突が気になるのですが、
MacOS X 付属のconfig.guess, config.subが上記の名称
をかえしますしunameもとうとう今回から「Mac OS」
とはっきり答えますので、致し方ないでしょう。


diff -rcN ruby-1.4.4.orig/config.guess ruby-1.4.4-x/config.guess
*** ruby-1.4.4.orig/config.guess	Thu Feb  3 20:33:29 2000
--- ruby-1.4.4-x/config.guess	Sat Apr 22 23:14:41 2000
***************
*** 969,974 ****
--- 969,978 ----
      *:Rhapsody:*:*)
  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
  	exit 0 ;;
+     *:"Mac OS":*:*)
+         echo `uname -p`-apple-macos${UNAME_RELEASE}
+         exit 0 ;;
+
  esac

  #echo '(No uname command or uname output not recognized.)' 1>&2
diff -rcN ruby-1.4.4.orig/config.sub ruby-1.4.4-x/config.sub
*** ruby-1.4.4.orig/config.sub	Sun Feb 27 00:17:34 2000
--- ruby-1.4.4-x/config.sub	Sat Apr 22 23:15:30 2000
***************
*** 910,916 ****
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux* | -uxpv* | -beos* | -mpeix* | -udk* \
! 	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
  	# Remember, each alternative MUST END IN *, to match a version  
number.
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--- 910,916 ----
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux* | -uxpv* | -beos* | -mpeix* | -udk* \
! 	      | -interix* | -uwin* | -rhapsody* | -openstep* | -macos |  
-oskit*)
  	# Remember, each alternative MUST END IN *, to match a version  
number.
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
diff -rcN ruby-1.4.4.orig/configure.in ruby-1.4.4-x/configure.in
*** ruby-1.4.4.orig/configure.in	Wed Apr 12 01:13:32 2000
--- ruby-1.4.4-x/configure.in	Sat Apr 22 22:34:28 2000
***************
*** 43,48 ****
--- 43,54 ----
     	        TARGET_ARCHS="ppc i386"
    		fi
  	;;
+     macos*)
+         echo -n "MacOS X : "
+ 	  	if test "$TARGET_ARCHS" = "" ; then
+    	        TARGET_ARCHS="ppc i386"
+   		fi
+ 	;;
      nextstep*|openstep*)
    	    echo -n "NeXTSTEP/OPENSTEP: "
  	    if test "$TARGET_ARCHS" = "" ; then
***************
*** 140,145 ****
--- 146,152 ----
  nextstep*)	;;
  openstep*)	;;
  rhapsody*)	;;
+ macos*)	;;
  human*)		ac_cv_func_getpgrp_void=yes;;
  beos*)		;;
  cygwin*)	;;
***************
*** 394,399 ****
--- 401,407 ----
      nextstep*)	;;
      openstep*)	;;
      rhapsody*)	;;
+     macos*)	;;
      human*)	;;
      bsdi*)	;;
      cygwin*)	;;
***************
*** 472,477 ****
--- 480,489 ----
  			LDFLAGS=""
  			DLDFLAGS="$ARCH_FLAG"
  			rb_cv_dlopen=yes ;;
+ 	macos*)		LDSHARED='cc -dynamic -bundle -undefined suppress'
+ 			LDFLAGS=""
+ 			DLDFLAGS="$ARCH_FLAG"
+ 			rb_cv_dlopen=yes ;;
  	aix*)		LDSHARED='/usr/ccs/bin/ld'
  			XLDFLAGS='-Wl,-bE:ruby.imp'
  			DLDFLAGS='-eInit_$(TARGET) -bI:$(topdir)/ruby.imp  
-bM:SRE -T512 -H512 -lc'
***************
*** 540,545 ****
--- 552,559 ----
  	 	AC_DEFINE(DLEXT, ".bundle");;
      rhapsody*)	DLEXT=bundle
  	 	AC_DEFINE(DLEXT, ".bundle");;
+     macos*)	DLEXT=bundle
+ 	 	AC_DEFINE(DLEXT, ".bundle");;
      cygwin*)	DLEXT=dll
  	 	AC_DEFINE(DLEXT, ".dll");;
      os2_emx*)	DLEXT=dll
***************
*** 564,569 ****
--- 578,585 ----
    openstep*)
  	STRIP='strip -A -n';;
    rhapsody*)
+ 	STRIP='strip -A -n';;
+   macos*)
  	STRIP='strip -A -n';;
  esac

diff -rcN ruby-1.4.4.orig/ext/extmk.rb.in ruby-1.4.4-x/ext/extmk.rb.in
*** ruby-1.4.4.orig/ext/extmk.rb.in	Thu Apr  6 23:11:05 2000
--- ruby-1.4.4-x/ext/extmk.rb.in	Sat Apr 22 22:38:47 2000
***************
*** 500,506 ****
    $objs = nil
    $local_flags = ""
    case RUBY_PLATFORM
!   when /cygwin|beos|openstep|nextstep|rhapsody|i386-os2_emx/
      $libs = ""
    when /mswin32/
      $LIBEXT = "lib"
--- 500,506 ----
    $objs = nil
    $local_flags = ""
    case RUBY_PLATFORM
!   when /cygwin|beos|openstep|nextstep|rhapsody|macos|i386-os2_emx/
      $libs = ""
    when /mswin32/
      $LIBEXT = "lib"