diff options
Diffstat (limited to 'lang/ruby18-base/patches/patch-aa')
| -rw-r--r-- | lang/ruby18-base/patches/patch-aa | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa index aa5b742d115..51b38fc41c1 100644 --- a/lang/ruby18-base/patches/patch-aa +++ b/lang/ruby18-base/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $ +$NetBSD: patch-aa,v 1.1.1.1.4.1 2005/09/22 16:45:00 salo Exp $ --- configure.in.orig 2004-12-23 00:16:55.000000000 +0900 +++ configure.in @@ -12,17 +12,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $ freebsd*) LIBS="-lm $LIBS" AC_CACHE_CHECK([whether -lxpg4 has to be linked], rb_cv_lib_xpg4_needed, -@@ -813,7 +816,7 @@ if test "$with_dln_a_out" != yes; then - openstep*) CCDLFLAGS="$CCDLFLAGS -fno-common";; - rhapsody*) CCDLFLAGS="$CCDLFLAGS -fno-common";; - darwin*) CCDLFLAGS="$CCDLFLAGS -fno-common";; -- human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;; -+ human*|interix3*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;; - *) CCDLFLAGS="$CCDLFLAGS -fPIC";; - esac - else -@@ -875,6 +878,13 @@ if test "$with_dln_a_out" != yes; then - test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" +@@ -863,6 +866,13 @@ if test "$with_dln_a_out" != yes; then + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes ;; + interix3*) : ${LDSHARED='${CC} -shared'} @@ -32,13 +23,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $ + 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" -@@ -1172,6 +1182,14 @@ if test "$enable_shared" = 'yes'; then - LIBRUBY_ALIASES="" - fi - ;; + interix*) : ${LDSHARED="$CC -shared"} + XLDFLAGS="$XLDFLAGS -Wl,-E" + LIBPATHFLAG=" -L'%1\$-s'" +@@ -1216,6 +1226,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' + ;; + interix3*) + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' @@ -47,6 +38,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:57 taca Exp $ + 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}` + interix*) + LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)' + ;; |