svn commit: r480158 - in head: Mk lang/ruby24/files lang/ruby25/files
Romain Tartière
romain at FreeBSD.org
Thu Sep 20 09:12:07 UTC 2018
Author: romain
Date: Thu Sep 20 09:12:06 2018
New Revision: 480158
URL: https://svnweb.freebsd.org/changeset/ports/480158
Log:
Revert the "DLD_FLAGS" pollution part of r475483.
It was initially got from ruby23, but recent ruby releases have some
differences in runtime linking, which was not hit by exp-run, and caused
trouble with some ports (e.g. devel/leatherman, sysutils/facter).
PR: 230238
Submitted by: fluffy
Reported by: freebsd at ptty.com
Approved by: fluffy
Modified:
head/Mk/bsd.ruby.mk
head/lang/ruby24/files/patch-configure.in
head/lang/ruby25/files/patch-configure.ac
Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk Thu Sep 20 09:08:25 2018 (r480157)
+++ head/Mk/bsd.ruby.mk Thu Sep 20 09:12:06 2018 (r480158)
@@ -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
Modified: head/lang/ruby24/files/patch-configure.in
==============================================================================
--- head/lang/ruby24/files/patch-configure.in Thu Sep 20 09:08:25 2018 (r480157)
+++ head/lang/ruby24/files/patch-configure.in Thu Sep 20 09:12:06 2018 (r480158)
@@ -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=''
Modified: head/lang/ruby25/files/patch-configure.ac
==============================================================================
--- head/lang/ruby25/files/patch-configure.ac Thu Sep 20 09:08:25 2018 (r480157)
+++ head/lang/ruby25/files/patch-configure.ac Thu Sep 20 09:12:06 2018 (r480158)
@@ -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=''
More information about the svn-ports-all
mailing list