View | Details | Raw Unified | Return to bug 229898
Collapse All | Expand All

(-)Mk/bsd.ruby.mk (-2 / +2 lines)
Lines 165-171 Link Here
165 
# Ruby 2.4
 165 
# Ruby 2.4
166 
#
 166 
#
167 
RUBY_RELVERSION=	2.4.4
 167 
RUBY_RELVERSION=	2.4.4
168 
RUBY_PORTREVISION=	0
 168 
RUBY_PORTREVISION=	1
169 
RUBY_PORTEPOCH=		1
 169 
RUBY_PORTEPOCH=		1
170 
RUBY_PATCHLEVEL=	0
 170 
RUBY_PATCHLEVEL=	0
171 
RUBY24=			""	# PLIST_SUB helpers
 171 
RUBY24=			""	# PLIST_SUB helpers
Lines 175-181 Link Here
175 
# Ruby 2.5
 175 
# Ruby 2.5
176 
#
 176 
#
177 
RUBY_RELVERSION=	2.5.1
 177 
RUBY_RELVERSION=	2.5.1
178 
RUBY_PORTREVISION=	0
 178 
RUBY_PORTREVISION=	1
179 
RUBY_PORTEPOCH=		1
 179 
RUBY_PORTEPOCH=		1
180 
RUBY_PATCHLEVEL=	0
 180 
RUBY_PATCHLEVEL=	0
181 
RUBY25=			""	# PLIST_SUB helpers
 181 
RUBY25=			""	# PLIST_SUB helpers
(-)lang/ruby24/files/patch-configure.in (+19 lines)
Line 0 Link Here
1 
--- configure.in.orig	2018-03-02 20:59:11.000000000 +0800
2 
+++ configure.in	2018-07-19 14:22:04.753721000 +0800
3 
@@ -3423,7 +3423,6 @@
4 
 			: ${LDSHARED='$(CC) -shared'}
5 
 			if test "$rb_cv_binary_elf" = yes; then
6 
 			    LDFLAGS="$LDFLAGS -rdynamic"
7 
-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
8 
 			else
9 
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
10 
 			fi
11 
@@ -3896,6 +3895,8 @@
12 
     [freebsd*|dragonfly*], [
13 
 	SOLIBS='$(LIBS)'
14 
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
15 
+	RUBY_APPEND_OPTIONS(DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"])
16 
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"])
17 
 	if test "$rb_cv_binary_elf" != "yes" ; then
18 
 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
19 
 	    LIBRUBY_ALIASES=''
(-)lang/ruby25/files/patch-configure.ac (+19 lines)
Line 0 Link Here
1 
--- configure.ac.orig	2018-01-04 02:12:16.000000000 +0800
2 
+++ configure.ac	2018-07-19 14:45:11.636321000 +0800
3 
@@ -3245,7 +3245,6 @@
4 
 			: ${LDSHARED='$(CC) -shared'}
5 
 			AS_IF([test "$rb_cv_binary_elf" = yes], [
6 
 			    LDFLAGS="$LDFLAGS -rdynamic"
7 
-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
8 
 			], [
9 
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
10 
 			])
11 
@@ -3724,6 +3723,8 @@
12 
 	SOLIBS='$(LIBS)'
13 
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
14 
 	LIBRUBY_SONAME='$(LIBRUBY_SO)'
15 
+	RUBY_APPEND_OPTIONS(DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"])
16 
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}' "$LDFLAGS_OPTDIR"])
17 
 	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
18 
 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
19 
 	    LIBRUBY_ALIASES=''

Return to bug 229898