From owner-svn-ports-all@freebsd.org Thu Sep 20 09:12:07 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 451D31095EC9; Thu, 20 Sep 2018 09:12:07 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EBD7883C66; Thu, 20 Sep 2018 09:12:06 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC8E21BF66; Thu, 20 Sep 2018 09:12:06 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8K9C6Zk078742; Thu, 20 Sep 2018 09:12:06 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8K9C63N078740; Thu, 20 Sep 2018 09:12:06 GMT (envelope-from romain@FreeBSD.org) Message-Id: <201809200912.w8K9C63N078740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Thu, 20 Sep 2018 09:12:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480158 - in head: Mk lang/ruby24/files lang/ruby25/files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head: Mk lang/ruby24/files lang/ruby25/files X-SVN-Commit-Revision: 480158 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Sep 2018 09:12:07 -0000 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@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=''