Date: Tue, 25 Sep 2018 13:11:15 +0000 (UTC) From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480661 - in head: Mk lang/ruby24/files lang/ruby25/files Message-ID: <201809251311.w8PDBFMS028470@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: romain Date: Tue Sep 25 13:11:14 2018 New Revision: 480661 URL: https://svnweb.freebsd.org/changeset/ports/480661 Log: Address more linker issues This resolves a ninja-related issues, corrects passing private args to linker while building libruby itself (without external LDFLAGS), exports the full symbols table, and pet 'pkg check -d'. Issues with weechat, vim, facter, rubygem-hpricot and rubygem-rdiscount should be fixed. See [1] for long story of hunting and fixing these issues. Bump PORTREVISIONS accordingly. PR: 230238 [1], 231361 Submitted by: fuffy Approved by: fuffy 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 Tue Sep 25 12:22:10 2018 (r480660) +++ head/Mk/bsd.ruby.mk Tue Sep 25 13:11:14 2018 (r480661) @@ -165,7 +165,7 @@ RUBY23= "" # PLIST_SUB helpers # Ruby 2.4 # RUBY_RELVERSION= 2.4.4 -RUBY_PORTREVISION= 3 +RUBY_PORTREVISION= 4 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= 4 +RUBY_PORTREVISION= 5 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 Tue Sep 25 12:22:10 2018 (r480660) +++ head/lang/ruby24/files/patch-configure.in Tue Sep 25 13:11:14 2018 (r480661) @@ -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='' Modified: head/lang/ruby25/files/patch-configure.ac ============================================================================== --- head/lang/ruby25/files/patch-configure.ac Tue Sep 25 12:22:10 2018 (r480660) +++ head/lang/ruby25/files/patch-configure.ac Tue Sep 25 13:11:14 2018 (r480661) @@ -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=''
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809251311.w8PDBFMS028470>