Attachment 197427 Details for Bug 230238 – Patch v2 - Fixes regressions

[patch] Patch v2 - Fixes regressions

ruby-stage2.diff (text/plain), 2.01 KB, created by Kubilay Kocak on 2018-09-24 11:03:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kubilay Kocak

Created: 2018-09-24 11:03:23 UTC

Size: 2.01 KB

patch

obsolete

>Index: ruby24/files/patch-configure.in
>===================================================================
>--- ruby24/files/patch-configure.in	(revision 480512)
>+++ ruby24/files/patch-configure.in	(working copy)
>@@ -18,11 +18,20 @@
>  	     void *arg, int (*compar)(void *, const void *, const void *));
>  ],[ ],
>        [rb_cv_bsd_qsort_r=yes],
>-@@ -3423,7 +3423,6 @@
>+@@ -3423,7 +3423,7 @@
>  			: ${LDSHARED='$(CC) -shared'}
>  			if test "$rb_cv_binary_elf" = yes; then
>  			    LDFLAGS="$LDFLAGS -rdynamic"
> -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
>++			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
>  			else
>  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
>  			fi
>+@@ -3896,6 +3895,7 @@
>+     [freebsd*|dragonfly*], [
>+ 	SOLIBS='$(LIBS)'
>+ 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
>++	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
>+ 	if test "$rb_cv_binary_elf" != "yes" ; then
>+ 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
>+ 	    LIBRUBY_ALIASES=''
>Index: ruby25/files/patch-configure.ac
>===================================================================
>--- ruby25/files/patch-configure.ac	(revision 480512)
>+++ ruby25/files/patch-configure.ac	(working copy)
>@@ -18,11 +18,20 @@
>  	     void *arg, int (*compar)(void *, const void *, const void *));
>  ],[ ],
>        [rb_cv_bsd_qsort_r=yes],
>-@@ -3245,7 +3245,6 @@
>+@@ -3245,7 +3245,7 @@
>  			: ${LDSHARED='$(CC) -shared'}
>  			AS_IF([test "$rb_cv_binary_elf" = yes], [
>  			    LDFLAGS="$LDFLAGS -rdynamic"
> -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
>++			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
>  			], [
>  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
>  			])
>+@@ -3724,6 +3723,7 @@
>+ 	SOLIBS='$(LIBS)'
>+ 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
>+ 	LIBRUBY_SONAME='$(LIBRUBY_SO)'
>++	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
>+ 	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
>+ 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
>+ 	    LIBRUBY_ALIASES=''

Flags:

koobs: maintainer-approval? (ruby)
koobs: maintainer-approval? (ports-secteam)

Actions: View | Diff

Attachments on bug 230238: 197263 | 197427