diff options
Diffstat (limited to 'lang/ruby18-base/patches/patch-ab')
| -rw-r--r-- | lang/ruby18-base/patches/patch-ab | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/lang/ruby18-base/patches/patch-ab b/lang/ruby18-base/patches/patch-ab index 8a182490da1..af2a6d3de72 100644 --- a/lang/ruby18-base/patches/patch-ab +++ b/lang/ruby18-base/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.8 2007/03/15 16:41:30 taca Exp $ +$NetBSD: patch-ab,v 1.9 2007/09/09 14:17:13 taca Exp $ ---- configure.orig 2007-03-05 00:11:03.000000000 +0900 +--- configure.orig 2007-06-08 17:51:42.000000000 +0900 +++ configure -@@ -10346,6 +10346,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" +@@ -10351,6 +10351,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" ;; bsdi*) LIBS="-lm $LIBS" ac_cv_sizeof_rlim_t=8;; @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.8 2007/03/15 16:41:30 taca Exp $ 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; } -@@ -15947,6 +15950,13 @@ echo $ECHO_N "checking whether OS depend +@@ -15952,6 +15955,13 @@ echo $ECHO_N "checking whether OS depend LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes ;; @@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.8 2007/03/15 16:41:30 taca Exp $ interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L'%1\$-s'" -@@ -16714,6 +16724,14 @@ if test "$enable_shared" = 'yes'; then +@@ -16707,6 +16717,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' ;; @@ -39,16 +39,13 @@ $NetBSD: patch-ab,v 1.8 2007/03/15 16:41:30 taca Exp $ + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' + ;; interix*) - LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)' + LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' ;; -@@ -16724,8 +16742,10 @@ fi +@@ -16716,6 +16734,7 @@ if test "$enable_shared" = 'yes'; then + fi if test "$enable_rpath" = yes; then - if test "$GCC" = yes; then - LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" -+ LIBRUBY_DLDFLAGS='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS" - else - LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" -+ LIBRUBY_DLDFLAGS='-R $(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS" - fi + LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED" ++ LIBRUBY_DLDFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBY_DLDFLAGS" fi + LDFLAGS="-L. $LDFLAGS" |