Add ruby build support for Interix, modeled on NetBSD config.

3 files changed, 99 insertions, 15 deletions

diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index ec522e31777..fc64f3de86a 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2004/12/24 14:27:30 taca Exp $
+$NetBSD: distinfo,v 1.5 2005/01/21 06:13:36 tv Exp $
 
 SHA1 (ruby/ruby-1.8.1.tar.gz) = 894cb1e7624b74e699d127344ce5600fc3a7d515
 Size (ruby/ruby-1.8.1.tar.gz) = 2671875 bytes
-SHA1 (patch-aa) = a04ac9081daa0e98e95ff53be6d9a5b031e8f39d
-SHA1 (patch-ab) = 81e2719822f5c9c3a2ace92d9315e6188ebe0396
+SHA1 (patch-aa) = 4c839205d4657605c4858c314d860cfea9c257d7
+SHA1 (patch-ab) = 2a5acc5b8d9b53eef036b958c2a80aae20e6e257
 SHA1 (patch-ac) = ad9da65c2b09f0ee4b368989cb7b03fe3217c077
 SHA1 (patch-ad) = a9561d30dd9ba8506a2943d50e8e5abdfe359db2
 SHA1 (patch-af) = 163dbcb44bd8784ac3e90df1e39ec927f927300f
diff --git a/lang/ruby18/patches/patch-aa b/lang/ruby18/patches/patch-aa
index 85cdf4f3c3f..7e79768911f 100644
--- a/lang/ruby18/patches/patch-aa
+++ b/lang/ruby18/patches/patch-aa
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.2 2004/11/29 08:20:06 taca Exp $
+$NetBSD: patch-aa,v 1.3 2005/01/21 06:13:36 tv Exp $
 
---- configure.in.orig	2003-12-25 04:19:12.000000000 +0900
+--- configure.in.orig	2003-12-24 14:19:12.000000000 -0500
 +++ configure.in
-@@ -864,6 +864,12 @@ if test "$with_dln_a_out" != yes; then
+@@ -314,6 +314,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
+ 		ac_cv_func_getpgrp_void=yes
+ 		ac_cv_func_setitimer=no
+ 		;;
++interix3*)	LIBS="-lm $LIBS"
++		ac_cv_func_getpgrp_void=yes
++		;;
+ freebsd*)	LIBS="-lm $LIBS"
+ 		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
+ 		  rb_cv_lib_xpg4_needed,
+@@ -824,6 +827,7 @@ if test "$with_dln_a_out" != yes; then
+     mingw*)	;;
+     aix*)	;;
+     netbsd*) CCDLFLAGS="$CCDLFLAGS -fPIC";;
++    interix3*)	;;
+     *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
+     esac
+   else
+@@ -864,6 +868,12 @@ if test "$with_dln_a_out" != yes; then
  	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
  			rb_cv_dlopen=yes ;;
  	linux*) 	: ${LDSHARED="$CC -shared"}
@@ -15,7 +33,7 @@ $NetBSD: patch-aa,v 1.2 2004/11/29 08:20:06 taca Exp $
  			rb_cv_dlopen=yes ;;
  	gnu*)   	: ${LDSHARED="$CC -shared"}
  			rb_cv_dlopen=yes
-@@ -879,6 +885,7 @@ if test "$with_dln_a_out" != yes; then
+@@ -879,10 +889,18 @@ if test "$with_dln_a_out" != yes; then
  	netbsd*)	: ${LDSHARED='${CC} -shared'}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
@@ -23,7 +41,18 @@ $NetBSD: patch-aa,v 1.2 2004/11/29 08:20:06 taca Exp $
  			    LIBPATHFLAG=' -L%1$-s'
  			    RPATHFLAG=' -Wl,-R%1$-s'
  			fi
-@@ -1157,6 +1164,7 @@ if test "$enable_shared" = 'yes'; then
+ 			rb_cv_dlopen=yes ;;
++	interix3*)	: ${LDSHARED='${CC} -shared'}
++			LDFLAGS="$LDFLAGS -Wl,-E"
++			# use special random-slot linkage in 0x[56]XXXXXXX
++			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %%4096/2*262144+1342177280))'
++			LIBPATHFLAG=' -L%1$-s'
++			RPATHFLAG=' -Wl,-R%1$-s'
++			rb_cv_dlopen=yes ;;
+ 	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+ 			if test "$rb_cv_binary_elf" = yes; then
+ 			    LDFLAGS="$LDFLAGS -Wl,-E"
+@@ -1157,6 +1175,7 @@ if test "$enable_shared" = 'yes'; then
  	;;
      linux*)
  	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
@@ -31,7 +60,20 @@ $NetBSD: patch-aa,v 1.2 2004/11/29 08:20:06 taca Exp $
  	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
  	;;
      gnu*)
-@@ -1187,6 +1195,13 @@ if test "$enable_shared" = 'yes'; then
+@@ -1182,11 +1201,26 @@ if test "$enable_shared" = 'yes'; then
+ 	   LIBRUBY_ALIASES=""
+ 	fi
+  	;;
++    interix3*)
++	SOLIBS='$(LIBS)'
++	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
++	# link explicitly to 0x48000000
++	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
++	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
++	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
++ 	;;
+     openbsd*)
+ 	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
  	;;
      solaris*)
diff --git a/lang/ruby18/patches/patch-ab b/lang/ruby18/patches/patch-ab
index 047bb619a2d..f8a5da50d8f 100644
--- a/lang/ruby18/patches/patch-ab
+++ b/lang/ruby18/patches/patch-ab
@@ -1,8 +1,26 @@
-$NetBSD: patch-ab,v 1.2 2004/11/29 08:20:06 taca Exp $
+$NetBSD: patch-ab,v 1.3 2005/01/21 06:13:36 tv Exp $
 
---- configure.orig	2003-12-25 04:21:24.000000000 +0900
+--- configure.orig	2003-12-24 14:21:24.000000000 -0500
 +++ configure
-@@ -13729,6 +13729,12 @@ echo $ECHO_N "checking whether OS depend
+@@ -8602,6 +8602,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
+ 		ac_cv_func_getpgrp_void=yes
+ 		ac_cv_func_setitimer=no
+ 		;;
++interix3*)	LIBS="-lm $LIBS"
++		ac_cv_func_getpgrp_void=yes
++		;;
+ freebsd*)	LIBS="-lm $LIBS"
+ 		echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5
+ echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6
+@@ -13689,6 +13692,7 @@ echo $ECHO_N "checking whether OS depend
+     mingw*)	;;
+     aix*)	;;
+     netbsd*) CCDLFLAGS="$CCDLFLAGS -fPIC";;
++    interix3*)	;;
+     *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
+     esac
+   else
+@@ -13729,6 +13733,12 @@ echo $ECHO_N "checking whether OS depend
  	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
  			rb_cv_dlopen=yes ;;
  	linux*) 	: ${LDSHARED="$CC -shared"}
@@ -15,7 +33,7 @@ $NetBSD: patch-ab,v 1.2 2004/11/29 08:20:06 taca Exp $
  			rb_cv_dlopen=yes ;;
  	gnu*)   	: ${LDSHARED="$CC -shared"}
  			rb_cv_dlopen=yes
-@@ -13744,6 +13750,7 @@ echo $ECHO_N "checking whether OS depend
+@@ -13744,10 +13754,18 @@ echo $ECHO_N "checking whether OS depend
  	netbsd*)	: ${LDSHARED='${CC} -shared'}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
@@ -23,7 +41,18 @@ $NetBSD: patch-ab,v 1.2 2004/11/29 08:20:06 taca Exp $
  			    LIBPATHFLAG=' -L%1$-s'
  			    RPATHFLAG=' -Wl,-R%1$-s'
  			fi
-@@ -14438,6 +14445,7 @@ if test "$enable_shared" = 'yes'; then
+ 			rb_cv_dlopen=yes ;;
++	interix3*)	: ${LDSHARED='${CC} -shared'}
++			LDFLAGS="$LDFLAGS -Wl,-E"
++			# use special random-slot linkage in 0x[56]XXXXXXX
++			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %%4096/2*262144+1342177280))'
++			LIBPATHFLAG=' -L%1$-s'
++			RPATHFLAG=' -Wl,-R%1$-s'
++			rb_cv_dlopen=yes ;;
+ 	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+ 			if test "$rb_cv_binary_elf" = yes; then
+ 			    LDFLAGS="$LDFLAGS -Wl,-E"
+@@ -14438,6 +14456,7 @@ if test "$enable_shared" = 'yes'; then
  	;;
      linux*)
  	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
@@ -31,7 +60,20 @@ $NetBSD: patch-ab,v 1.2 2004/11/29 08:20:06 taca Exp $
  	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
  	;;
      gnu*)
-@@ -14468,6 +14476,13 @@ if test "$enable_shared" = 'yes'; then
+@@ -14463,11 +14482,26 @@ if test "$enable_shared" = 'yes'; then
+ 	   LIBRUBY_ALIASES=""
+ 	fi
+  	;;
++    interix3*)
++	SOLIBS='$(LIBS)'
++	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
++	# link explicitly to 0x48000000
++	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
++	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
++	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
++ 	;;
+     openbsd*)
+ 	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
  	;;
      solaris*)