diff options
author | tv <tv> | 2005-01-21 06:13:36 +0000 |
---|---|---|
committer | tv <tv> | 2005-01-21 06:13:36 +0000 |
commit | f1443937837236367d434117d928a6d0593268c1 (patch) | |
tree | 3f664e61ca1565c020551a20fe546ecc588f1bb6 /lang | |
parent | b9192309c907d70cafdd83a5818a3f73ab8a0a76 (diff) | |
download | pkgsrc-f1443937837236367d434117d928a6d0593268c1.tar.gz |
Add ruby build support for Interix, modeled on NetBSD config.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby/Makefile.common | 4 | ||||
-rw-r--r-- | lang/ruby16/distinfo | 6 | ||||
-rw-r--r-- | lang/ruby16/patches/patch-aa | 61 | ||||
-rw-r--r-- | lang/ruby16/patches/patch-ab | 61 | ||||
-rw-r--r-- | lang/ruby18/distinfo | 6 | ||||
-rw-r--r-- | lang/ruby18/patches/patch-aa | 54 | ||||
-rw-r--r-- | lang/ruby18/patches/patch-ab | 54 |
7 files changed, 206 insertions, 40 deletions
diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common index 4d4173767cf..424cf39ad31 100644 --- a/lang/ruby/Makefile.common +++ b/lang/ruby/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2004/11/29 03:31:53 taca Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/01/21 06:13:36 tv Exp $ # # Ruby base distribution common definition @@ -39,7 +39,7 @@ DIST_SUBDIR?= ${RUBY_DIST_SUBDIR} RUBY_SHLIBMAJOR?= ${_RUBY_VER_MAJOR} RUBY_SHLIBVER?= ${RUBY_VERSION} -.if ${OPSYS} == "NetBSD" +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix" RUBY_SHLIBMAJOR= ${RUBY_VER} RUBY_SHLIBVER= ${RUBY_VER}.${_RUBY_VERS_TEENY} .elif ${OPSYS} == "FreeBSD" diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo index a9174c5e9a0..40ee98de5a2 100644 --- a/lang/ruby16/distinfo +++ b/lang/ruby16/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ +$NetBSD: distinfo,v 1.2 2005/01/21 06:13:36 tv Exp $ SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1 Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes -SHA1 (patch-aa) = 1c6d4f4c376ac666f9d70e3b556bef314450156f -SHA1 (patch-ab) = 6709764404153b1f3c125480256b8af23c74a218 +SHA1 (patch-aa) = ba4551cc3de31036a3cf8d50478bfdcbcadee38b +SHA1 (patch-ab) = 57abd1b0e6af14b20c3a284615160c144c18cfdc SHA1 (patch-ac) = 19f520406a9b699a4bbe53b0e9e2b69b4eb7d96a SHA1 (patch-ad) = 8a3e5eb250f517f10bea7f52fbfe8b05957b7bb4 SHA1 (patch-ae) = 2e096dcb882be923d2ff775a4271a300954a9dec diff --git a/lang/ruby16/patches/patch-aa b/lang/ruby16/patches/patch-aa index 4618d96e746..fb9f7edc026 100644 --- a/lang/ruby16/patches/patch-aa +++ b/lang/ruby16/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ +$NetBSD: patch-aa,v 1.2 2005/01/21 06:13:36 tv Exp $ ---- configure.in.orig 2002-11-14 03:59:18.000000000 +0900 +--- configure.in.orig 2002-11-13 13:59:18.000000000 -0500 +++ configure.in -@@ -324,7 +324,8 @@ AC_HEADER_STDC +@@ -264,6 +264,8 @@ os2_emx*) LIBS="-lm $LIBS" + ac_cv_lib_dir_opendir=no;; + msdosdjgpp*) LIBS="-lm $LIBS" + ac_cv_func_getpgrp_void=yes;; ++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, +@@ -324,7 +326,8 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\ fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\ @@ -12,7 +21,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ dnl Checks for typedefs, structures, and compiler characteristics. AC_TYPE_UID_T -@@ -456,6 +457,49 @@ else +@@ -456,6 +459,49 @@ else AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt) fi @@ -62,7 +71,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ dnl default value for $KANJI DEFAULT_KCODE="KCODE_NONE" -@@ -563,7 +607,7 @@ if test "$with_dln_a_out" != yes; then +@@ -549,6 +595,7 @@ if test "$with_dln_a_out" != yes; then + cygwin*) ;; + mingw*) ;; + netbsd*) CCDLFLAGS=-fPIC;; ++ interix3*) ;; + *) CCDLFLAGS=-fPIC;; + esac + else +@@ -563,7 +610,7 @@ if test "$with_dln_a_out" != yes; then case "$target_os" in hpux*) DLDFLAGS="-E" @@ -71,7 +88,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ LDFLAGS="-Wl,-E" rb_cv_dlopen=yes;; solaris*) if test "$GCC" = yes; then -@@ -578,7 +622,8 @@ if test "$with_dln_a_out" != yes; then +@@ -578,7 +625,8 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes;; sunos*) LDSHARED='ld -assert nodefinitions' rb_cv_dlopen=yes;; @@ -81,7 +98,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ rb_cv_dlopen=yes;; sysv4*) LDSHARED='ld -G' rb_cv_dlopen=yes;; -@@ -589,6 +634,12 @@ if test "$with_dln_a_out" != yes; then +@@ -589,6 +637,12 @@ if test "$with_dln_a_out" != yes; then osf*) LDSHARED="$CC -shared" rb_cv_dlopen=yes ;; linux*) LDSHARED="$CC -shared" @@ -94,7 +111,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ rb_cv_dlopen=yes ;; freebsd*) LDSHARED="$CC -shared" if test "$rb_cv_binary_elf" = yes; then -@@ -601,6 +652,9 @@ if test "$with_dln_a_out" != yes; then +@@ -601,8 +655,18 @@ if test "$with_dln_a_out" != yes; then netbsd*) LDSHARED='${CC} -shared' if test "$rb_cv_binary_elf" = yes; then LDFLAGS="-Wl,-export-dynamic" @@ -103,8 +120,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ + RPATHFLAG=' -Wl,-R%1$-s' fi rb_cv_dlopen=yes ;; ++ interix3*) LDSHARED='${CC} -shared' ++ 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="ld -Bforcearchive -Bshareable" -@@ -858,6 +912,7 @@ if test "$enable_shared" = 'yes'; then + rb_cv_dlopen=yes ;; + bsdi3*) case "$CC" in +@@ -858,6 +922,7 @@ if test "$enable_shared" = 'yes'; then ;; linux*) LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' @@ -112,7 +138,22 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so' ;; freebsd*) -@@ -1071,6 +1126,10 @@ if test "$search_path" != ""; then +@@ -879,6 +944,14 @@ if test "$enable_shared" = 'yes'; then + LIBRUBY_ALIASES="" + fi + ;; ++ interix3*) ++ SOLIBS='$(LIBS)' ++ LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' ++ # link explicitly to 0x48000000 ++ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' ++ LIBRUBYARG='-Wl,-R -Wl,${prefix}/lib -L${prefix}/lib -L. -l$(RUBY_INSTALL_NAME)' ++ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_INSTALL_NAME).so' ++ ;; + openbsd*) + SOLIBS='$(LIBS)' + ;; +@@ -1071,6 +1144,10 @@ if test "$search_path" != ""; then AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path") fi diff --git a/lang/ruby16/patches/patch-ab b/lang/ruby16/patches/patch-ab index b691eb7e68d..7055951dc14 100644 --- a/lang/ruby16/patches/patch-ab +++ b/lang/ruby16/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ +$NetBSD: patch-ab,v 1.2 2005/01/21 06:13:36 tv Exp $ ---- configure.orig 2002-11-19 20:49:26.000000000 +0900 +--- configure.orig 2002-11-19 06:49:26.000000000 -0500 +++ configure @@ -29,6 +29,8 @@ ac_help="$ac_help --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]" @@ -11,7 +11,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ # Initialize some variables set by options. # The variables have the same names as the options, with -@@ -2877,7 +2879,8 @@ fi +@@ -2324,6 +2326,8 @@ os2_emx*) LIBS="-lm $LIBS" + ac_cv_lib_dir_opendir=no;; + msdosdjgpp*) LIBS="-lm $LIBS" + ac_cv_func_getpgrp_void=yes;; ++interix3*) LIBS="-lm $LIBS" ++ ac_cv_func_getpgrp_void=yes;; + freebsd*) LIBS="-lm $LIBS" + echo $ac_n "checking whether -lxpg4 has to be linked""... $ac_c" 1>&6 + echo "configure:2330: checking whether -lxpg4 has to be linked" >&5 +@@ -2877,7 +2881,8 @@ fi for ac_hdr in stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\ fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\ @@ -21,7 +30,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -4387,6 +4390,330 @@ EOF +@@ -4387,6 +4392,330 @@ EOF fi @@ -352,7 +361,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ DEFAULT_KCODE="KCODE_NONE" # Check whether --with-default-kcode or --without-default-kcode was given. -@@ -4524,7 +4851,7 @@ echo "configure:4501: checking whether O +@@ -4510,6 +4839,7 @@ echo "configure:4501: checking whether O + cygwin*) ;; + mingw*) ;; + netbsd*) CCDLFLAGS=-fPIC;; ++ interix3*) ;; + *) CCDLFLAGS=-fPIC;; + esac + else +@@ -4524,7 +4854,7 @@ echo "configure:4501: checking whether O case "$target_os" in hpux*) DLDFLAGS="-E" @@ -361,7 +378,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ LDFLAGS="-Wl,-E" rb_cv_dlopen=yes;; solaris*) if test "$GCC" = yes; then -@@ -4539,7 +4866,8 @@ echo "configure:4501: checking whether O +@@ -4539,7 +4869,8 @@ echo "configure:4501: checking whether O rb_cv_dlopen=yes;; sunos*) LDSHARED='ld -assert nodefinitions' rb_cv_dlopen=yes;; @@ -371,7 +388,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ rb_cv_dlopen=yes;; sysv4*) LDSHARED='ld -G' rb_cv_dlopen=yes;; -@@ -4550,6 +4878,12 @@ echo "configure:4501: checking whether O +@@ -4550,6 +4881,12 @@ echo "configure:4501: checking whether O osf*) LDSHARED="$CC -shared" rb_cv_dlopen=yes ;; linux*) LDSHARED="$CC -shared" @@ -384,7 +401,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ rb_cv_dlopen=yes ;; freebsd*) LDSHARED="$CC -shared" if test "$rb_cv_binary_elf" = yes; then -@@ -4562,6 +4896,9 @@ echo "configure:4501: checking whether O +@@ -4562,8 +4899,18 @@ echo "configure:4501: checking whether O netbsd*) LDSHARED='${CC} -shared' if test "$rb_cv_binary_elf" = yes; then LDFLAGS="-Wl,-export-dynamic" @@ -393,8 +410,17 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ + RPATHFLAG=' -Wl,-R%1$-s' fi rb_cv_dlopen=yes ;; ++ interix3*) LDSHARED='${CC} -shared' ++ 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="ld -Bforcearchive -Bshareable" -@@ -5070,6 +5407,7 @@ if test "$enable_shared" = 'yes'; then + rb_cv_dlopen=yes ;; + bsdi3*) case "$CC" in +@@ -5070,6 +5417,7 @@ if test "$enable_shared" = 'yes'; then ;; linux*) LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' @@ -402,7 +428,22 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so' ;; freebsd*) -@@ -5315,6 +5653,15 @@ EOF +@@ -5091,6 +5439,14 @@ if test "$enable_shared" = 'yes'; then + LIBRUBY_ALIASES="" + fi + ;; ++ interix3*) ++ SOLIBS='$(LIBS)' ++ LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' ++ # link explicitly to 0x48000000 ++ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' ++ LIBRUBYARG='-Wl,-R -Wl,${prefix}/lib -L${prefix}/lib -L. -l$(RUBY_INSTALL_NAME)' ++ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_INSTALL_NAME).so' ++ ;; + openbsd*) + SOLIBS='$(LIBS)' + ;; +@@ -5315,6 +5671,15 @@ EOF fi 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*) |