diff options
| author | Romain Tartière <romain@FreeBSD.org> | 2018-09-25 13:11:14 +0000 |
|---|---|---|
| committer | Romain Tartière <romain@FreeBSD.org> | 2018-09-25 13:11:14 +0000 |
| commit | 54c14279dc8714371ee303eeba39d77beeb6baff (patch) | |
| tree | 4337f5ad2d068febaeb7f43ac983d7b88982bd58 /lang | |
| parent | d01b9add0abc7cb123349add2fca019342809a74 (diff) | |
| download | ports-54c14279dc8714371ee303eeba39d77beeb6baff.tar.gz ports-54c14279dc8714371ee303eeba39d77beeb6baff.zip | |
Notes
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby24/files/patch-configure.in | 11 | ||||
| -rw-r--r-- | lang/ruby25/files/patch-configure.ac | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/lang/ruby24/files/patch-configure.in b/lang/ruby24/files/patch-configure.in index fc717548afe3..b72fd938b61d 100644 --- a/lang/ruby24/files/patch-configure.in +++ b/lang/ruby24/files/patch-configure.in @@ -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='' diff --git a/lang/ruby25/files/patch-configure.ac b/lang/ruby25/files/patch-configure.ac index 200298eff208..08924ed4396a 100644 --- a/lang/ruby25/files/patch-configure.ac +++ b/lang/ruby25/files/patch-configure.ac @@ -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='' |