MirBSD support here, too

This commit is contained in:
bsiegert 2012-07-25 20:25:50 +00:00
parent 626dcfa9b7
commit 659fb87ba1
3 changed files with 51 additions and 15 deletions

View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.53 2012/07/24 16:23:37 taca Exp $
$NetBSD: distinfo,v 1.54 2012/07/25 20:25:50 bsiegert Exp $
SHA1 (ruby-1.8.7-p370.tar.bz2) = 92770a8159cd9049ffc5bc3ce4777b701eb19d7b
RMD160 (ruby-1.8.7-p370.tar.bz2) = 0c35ed92e4e77c6e6859d39244489c93f4efad50
Size (ruby-1.8.7-p370.tar.bz2) = 4211597 bytes
SHA1 (patch-aa) = 4c1572b5a1eb65e89a98c60540433a69cb96dd23
SHA1 (patch-ab) = b56b6c2ba182414492c803d36433730602e0a591
SHA1 (patch-aa) = 9f0ffa6fd0bcf2f59eba2604d2b6a4aaad075231
SHA1 (patch-ab) = 1466b6179cb6ac3a8ee3255eab98a1d3065a12ed
SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0
SHA1 (patch-ad) = 2b194a26f3a7b9bdf3afcc0819ab239479f47c5b
SHA1 (patch-aw) = d3dc491da64426ff72a9417a65eb99bee2d21044

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.14 2010/09/10 03:29:00 taca Exp $
$NetBSD: patch-aa,v 1.15 2012/07/25 20:25:50 bsiegert Exp $
* Adding Interix support.
* Adding Interix and MirBSD support.
--- configure.in.orig 2010-06-08 09:26:34.000000000 +0000
--- configure.in.orig Fri Feb 18 10:37:23 2011
+++ configure.in
@@ -456,6 +456,9 @@ bsdi*) LIBS="-lm $LIBS"
AC_DEFINE(BROKEN_SETREUID, 1)
@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.14 2010/09/10 03:29:00 taca Exp $
freebsd*) LIBS="-lm $LIBS"
AC_CACHE_CHECK([whether -lxpg4 has to be linked],
rb_cv_lib_xpg4_needed,
@@ -1226,6 +1229,13 @@ if test "$with_dln_a_out" != yes; then
@@ -1232,6 +1235,13 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
fi
rb_cv_dlopen=yes ;;
@ -28,7 +28,25 @@ $NetBSD: patch-aa,v 1.14 2010/09/10 03:29:00 taca Exp $
interix*) : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E"
LIBPATHFLAG=" -L%1\$-s"
@@ -1575,6 +1585,14 @@ if test "$enable_shared" = 'yes'; then
@@ -1244,7 +1254,7 @@ if test "$with_dln_a_out" != yes; then
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
rb_cv_dlopen=yes ;;
- openbsd*) : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+ openbsd*|mirbsd*) : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
fi
@@ -1545,7 +1555,7 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_ALIASES=""
fi
;;
- openbsd*)
+ openbsd*|mirbsd*)
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
;;
@@ -1581,6 +1591,14 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
;;
@ -43,7 +61,7 @@ $NetBSD: patch-aa,v 1.14 2010/09/10 03:29:00 taca Exp $
interix*)
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
;;
@@ -1584,6 +1602,7 @@ if test "$enable_shared" = 'yes'; then
@@ -1590,6 +1608,7 @@ if test "$enable_shared" = 'yes'; then
fi
if test "$enable_rpath" = yes; then
LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.14 2010/09/10 03:29:00 taca Exp $
$NetBSD: patch-ab,v 1.15 2012/07/25 20:25:50 bsiegert Exp $
* Adding Interix support.
* Adding Interix and MirBSD support.
--- configure.orig 2010-06-23 05:38:48.000000000 +0000
--- configure.orig Fri Jun 29 13:18:00 2012
+++ configure
@@ -6212,6 +6212,9 @@ bsdi*) LIBS="-lm $LIBS"
$as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.14 2010/09/10 03:29:00 taca Exp $
freebsd*) LIBS="-lm $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lxpg4 has to be linked" >&5
$as_echo_n "checking whether -lxpg4 has to be linked... " >&6; }
@@ -10196,6 +10199,13 @@ fi
@@ -10212,6 +10215,13 @@ fi
LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
fi
rb_cv_dlopen=yes ;;
@ -28,7 +28,25 @@ $NetBSD: patch-ab,v 1.14 2010/09/10 03:29:00 taca Exp $
interix*) : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E"
LIBPATHFLAG=" -L%1\$-s"
@@ -10724,6 +10734,14 @@ if test "$enable_shared" = 'yes'; then
@@ -10224,7 +10234,7 @@ fi
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
rb_cv_dlopen=yes ;;
- openbsd*) : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+ openbsd*|mirbsd*) : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
fi
@@ -10704,7 +10714,7 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_ALIASES=""
fi
;;
- openbsd*)
+ openbsd*|mirbsd*)
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
;;
@@ -10740,6 +10750,14 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
;;
@ -43,7 +61,7 @@ $NetBSD: patch-ab,v 1.14 2010/09/10 03:29:00 taca Exp $
interix*)
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
;;
@@ -10733,6 +10751,7 @@ if test "$enable_shared" = 'yes'; then
@@ -10749,6 +10767,7 @@ if test "$enable_shared" = 'yes'; then
fi
if test "$enable_rpath" = yes; then
LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"