diff options
| -rw-r--r-- | Mk/bsd.ruby.mk | 4 | ||||
| -rw-r--r-- | lang/ruby24/files/patch-configure.in | 9 | ||||
| -rw-r--r-- | lang/ruby25/files/patch-configure.ac | 9 |
3 files changed, 2 insertions, 20 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 67d64ed0d54e..9b4948ed68df 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -165,7 +165,7 @@ RUBY23= "" # PLIST_SUB helpers # Ruby 2.4 # RUBY_RELVERSION= 2.4.4 -RUBY_PORTREVISION= 2 +RUBY_PORTREVISION= 3 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY24= "" # PLIST_SUB helpers @@ -175,7 +175,7 @@ RUBY24= "" # PLIST_SUB helpers # Ruby 2.5 # RUBY_RELVERSION= 2.5.1 -RUBY_PORTREVISION= 3 +RUBY_PORTREVISION= 4 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY25= "" # PLIST_SUB helpers diff --git a/lang/ruby24/files/patch-configure.in b/lang/ruby24/files/patch-configure.in index 1509e6643b2b..fc717548afe3 100644 --- a/lang/ruby24/files/patch-configure.in +++ b/lang/ruby24/files/patch-configure.in @@ -26,12 +26,3 @@ else test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' fi -@@ -3896,6 +3895,8 @@ - [freebsd*|dragonfly*], [ - SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' -+ RUBY_APPEND_OPTIONS(DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"]) -+ RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"]) - if test "$rb_cv_binary_elf" != "yes" ; then - LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" - LIBRUBY_ALIASES='' diff --git a/lang/ruby25/files/patch-configure.ac b/lang/ruby25/files/patch-configure.ac index 747a706e6fd9..200298eff208 100644 --- a/lang/ruby25/files/patch-configure.ac +++ b/lang/ruby25/files/patch-configure.ac @@ -26,12 +26,3 @@ ], [ test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' ]) -@@ -3724,6 +3723,8 @@ - SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' - LIBRUBY_SONAME='$(LIBRUBY_SO)' -+ RUBY_APPEND_OPTIONS(DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"]) -+ RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"]) - AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ - LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" - LIBRUBY_ALIASES='' |