Page MenuHomeFreeBSD
Differential D19961 Diff 56372 lang/ruby26/files/patch-configure.ac

Changeset View

Standalone View

View Options

lang/ruby26/files/patch-configure.ac

--- configure.ac.orig 2018-01-03 18:12:16 UTC --- configure.ac.orig 2018-12-28 12:03:09 UTC
+++ configure.ac +++ configure.ac
@@ -2482,7 +2482,7 @@ AS_IF([test "$ac_cv_func_qsort_r" != no] @@ -2678,7 +2678,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
[AC_TRY_COMPILE([
@%:@include <stdlib.h>
-void qsort_r(void *base, size_t nmemb, size_t size,
+void (qsort_r)(void *base, size_t nmemb, size_t size,
int (*compar)(const void *, const void *, void *),
void *arg);
],[ ],
@@ -2492,7 +2492,7 @@ void qsort_r(void *base, size_t nmemb, s
AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,
[AC_TRY_COMPILE([
@%:@include <stdlib.h>
-void qsort_r(void *base, size_t nmemb, size_t size,
+void (qsort_r)(void *base, size_t nmemb, size_t size,
void *arg, int (*compar)(void *, const void *, const void *));
],[ ],
[rb_cv_bsd_qsort_r=yes],
@@ -3245,7 +3245,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
: ${LDSHARED='$(CC) -shared'} : ${LDSHARED='$(CC) -shared'}
AS_IF([test "$rb_cv_binary_elf" = yes], [ AS_IF([test "$rb_cv_binary_elf" = yes], [
LDFLAGS="$LDFLAGS -rdynamic" LDFLAGS="$LDFLAGS -rdynamic"
- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@' - DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
+ DLDFLAGS="$DLDFLAGS "'-Wl,-E' + DLDFLAGS="$DLDFLAGS "'-Wl,-E'
], [ ], [
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
]) ])
@@ -3724,6 +3724,7 @@ AS_CASE("$enable_shared", [yes], [ @@ -3163,6 +3163,7 @@ AS_CASE("$enable_shared", [yes], [
SOLIBS='$(LIBS)' [freebsd*|dragonfly*], [
koobsUnsubmitted
Not Done
Inline Actions

Is there an upstream issue/pr for this? If so, add to patch header as comment

koobs: Is there an upstream issue/pr for this? If so, add to patch header as comment
LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
LIBRUBY_SONAME='$(LIBRUBY_SO)' LIBRUBY_SONAME='$(LIBRUBY_SO)'
+ RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}']) + RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES='' LIBRUBY_ALIASES=''