Attachment 195287 Details for Bug 229898 – lang/ruby2[45]: get rid of unescaped "-Wl,soname,$@" in LDFLAGS

[patch] lang/ruby2[45]: get rid of unescaped "-Wl,soname,$@" in LDFLAGS

ruby-soname.diff (text/plain), 3.29 KB, created by Dima Panov on 2018-07-20 02:00:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2018-07-20 02:00:46 UTC

Size: 3.29 KB

patch

obsolete

>Index: Mk/bsd.ruby.mk
>===================================================================
>--- Mk/bsd.ruby.mk	(revision 474846)
>+++ Mk/bsd.ruby.mk	(working copy)
>@@ -165,7 +165,7 @@
> # Ruby 2.4
> #
> RUBY_RELVERSION=	2.4.4
>-RUBY_PORTREVISION=	0
>+RUBY_PORTREVISION=	1
> RUBY_PORTEPOCH=		1
> RUBY_PATCHLEVEL=	0
> RUBY24=			""	# PLIST_SUB helpers
>@@ -175,7 +175,7 @@
> # Ruby 2.5
> #
> RUBY_RELVERSION=	2.5.1
>-RUBY_PORTREVISION=	0
>+RUBY_PORTREVISION=	1
> RUBY_PORTEPOCH=		1
> RUBY_PATCHLEVEL=	0
> RUBY25=			""	# PLIST_SUB helpers
>Index: lang/ruby24/files/patch-configure.in
>===================================================================
>--- lang/ruby24/files/patch-configure.in	(nonexistent)
>+++ lang/ruby24/files/patch-configure.in	(working copy)
>@@ -0,0 +1,19 @@
>+--- configure.in.orig	2018-03-02 20:59:11.000000000 +0800
>++++ configure.in	2018-07-19 14:22:04.753721000 +0800
>+@@ -3423,7 +3423,6 @@
>+ 			: ${LDSHARED='$(CC) -shared'}
>+ 			if test "$rb_cv_binary_elf" = yes; then
>+ 			    LDFLAGS="$LDFLAGS -rdynamic"
>+-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
>+ 			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=''
>
>Property changes on: lang/ruby24/files/patch-configure.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lang/ruby25/files/patch-configure.ac
>===================================================================
>--- lang/ruby25/files/patch-configure.ac	(nonexistent)
>+++ lang/ruby25/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,19 @@
>+--- configure.ac.orig	2018-01-04 02:12:16.000000000 +0800
>++++ configure.ac	2018-07-19 14:45:11.636321000 +0800
>+@@ -3245,7 +3245,6 @@
>+ 			: ${LDSHARED='$(CC) -shared'}
>+ 			AS_IF([test "$rb_cv_binary_elf" = yes], [
>+ 			    LDFLAGS="$LDFLAGS -rdynamic"
>+-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
>+ 			], [
>+ 			  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=''
>
>Property changes on: lang/ruby25/files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 229898: 195287