diff options
Diffstat (limited to 'lang/ruby18-base/patches/patch-aa')
| -rw-r--r-- | lang/ruby18-base/patches/patch-aa | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa index 3f75b7c0923..c4681802679 100644 --- a/lang/ruby18-base/patches/patch-aa +++ b/lang/ruby18-base/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2005/09/19 15:19:13 taca Exp $ +$NetBSD: patch-aa,v 1.3 2005/11/02 08:56:40 taca Exp $ ---- configure.in.orig 2004-12-23 00:16:55.000000000 +0900 +--- configure.in.orig 2005-09-07 08:22:56.000000000 +0900 +++ configure.in -@@ -321,6 +321,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" +@@ -348,6 +348,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" ac_cv_func_getpgrp_void=yes ac_cv_func_setitimer=no ;; @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.2 2005/09/19 15:19:13 taca Exp $ freebsd*) LIBS="-lm $LIBS" AC_CACHE_CHECK([whether -lxpg4 has to be linked], rb_cv_lib_xpg4_needed, -@@ -863,6 +866,13 @@ if test "$with_dln_a_out" != yes; then +@@ -890,6 +893,13 @@ if test "$with_dln_a_out" != yes; then LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes ;; @@ -26,7 +26,20 @@ $NetBSD: patch-aa,v 1.2 2005/09/19 15:19:13 taca Exp $ interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L'%1\$-s'" -@@ -1216,6 +1226,14 @@ if test "$enable_shared" = 'yes'; then +@@ -970,7 +980,11 @@ if test "$with_dln_a_out" != yes; then + [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"]) + if test "$enable_rpath" = yes; then + LIBPATHFLAG=" -L'%1\$-s'" +- RPATHFLAG=" -Wl,-R'%1\$-s'" ++ if test "$GCC" = yes; then ++ RPATHFLAG=" -Wl,-R'%1\$-s'" ++ else ++ RPATHFLAG=" -R'%1\$-s'" ++ fi + fi + fi + AC_SUBST(LINK_SO) +@@ -1251,6 +1265,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' ;; |