Attachment 197263 Details for Bug 230238 – Full proposed change

[patch] Full proposed change

ruby-fix.patch (text/plain), 2.04 KB, created by Romain Tartière on 2018-09-20 09:04:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Romain Tartière

Created: 2018-09-20 09:04:48 UTC

Size: 2.04 KB

patch

obsolete

>Index: Mk/bsd.ruby.mk
>===================================================================
>--- Mk/bsd.ruby.mk	(rÃ©vision 480156)
>+++ Mk/bsd.ruby.mk	(copie de travail)
>@@ -165,7 +165,7 @@
> # 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 @@
> # Ruby 2.5
> #
> RUBY_RELVERSION=	2.5.1
>-RUBY_PORTREVISION=	3
>+RUBY_PORTREVISION=	4
> RUBY_PORTEPOCH=		1
> RUBY_PATCHLEVEL=	0
> RUBY25=			""	# PLIST_SUB helpers
>Index: lang/ruby24/files/patch-configure.in
>===================================================================
>--- lang/ruby24/files/patch-configure.in	(rÃ©vision 480156)
>+++ lang/ruby24/files/patch-configure.in	(copie de travail)
>@@ -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=''
>Index: lang/ruby25/files/patch-configure.ac
>===================================================================
>--- lang/ruby25/files/patch-configure.ac	(rÃ©vision 480156)
>+++ lang/ruby25/files/patch-configure.ac	(copie de travail)
>@@ -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=''

Actions: View | Diff

Attachments on bug 230238: 197263 | 197427