summaryrefslogtreecommitdiff
path: root/lang/ruby22-base/patches/patch-configure
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ruby22-base/patches/patch-configure')
-rw-r--r--lang/ruby22-base/patches/patch-configure97
1 files changed, 86 insertions, 11 deletions
diff --git a/lang/ruby22-base/patches/patch-configure b/lang/ruby22-base/patches/patch-configure
index 03596900e3c..4c8bf509ea7 100644
--- a/lang/ruby22-base/patches/patch-configure
+++ b/lang/ruby22-base/patches/patch-configure
@@ -1,11 +1,12 @@
-$NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
+$NetBSD: patch-configure,v 1.5 2017/07/06 16:35:05 taca Exp $
* Adding Interix support.
* Ignore doxygen.
+* Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
---- configure.orig 2016-04-26 04:51:48.000000000 +0000
+--- configure.orig 2017-03-28 07:53:45.000000000 +0000
+++ configure
-@@ -5579,7 +5579,7 @@ esac
+@@ -5581,7 +5581,7 @@ esac
else
if test x"$target_alias" = x; then
case "$target_os" in #(
@@ -14,7 +15,15 @@ $NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
$as_echo_n "checking for real target cpu... " >&6; }
-@@ -8850,6 +8850,10 @@ esac
+@@ -7456,6 +7456,7 @@ fi
+
+
+
++: ${DLDFLAGS="$LDFLAGS"}
+
+ case $RUBY_PATCHLEVEL in #(
+ -*) :
+@@ -8909,6 +8910,10 @@ esac
LIBS="-lm $LIBS"
ac_cv_func_round=no
;; #(
@@ -25,7 +34,7 @@ $NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
nacl) :
LIBS="-lm $LIBS"
-@@ -16945,6 +16949,8 @@ else
+@@ -17004,6 +17009,8 @@ else
# ifdef _MSC_VER
# include <malloc.h>
# define alloca _alloca
@@ -34,7 +43,7 @@ $NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
# else
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
-@@ -21234,7 +21240,9 @@ esac ;; #(
+@@ -21293,7 +21300,9 @@ esac ;; #(
interix*) :
: ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -44,7 +53,26 @@ $NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
rb_cv_dlopen=yes ;; #(
freebsd*|dragonfly*) :
-@@ -22455,7 +22463,7 @@ esac
+@@ -22503,7 +22512,17 @@ esac
+ ;; #(
+ linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu) :
+
+- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
++ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
++ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' "$LDFLAGS_OPTDIR"; do
++ case " ${LIBRUBY_DLDFLAGS-} " in #(
++ *" ${rb_opt} "*) :
++ ;; #(
++ ' ') :
++ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
++ *) :
++ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
++esac
++ done
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+ if test "$load_relative" = yes; then
+ libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
+@@ -22514,7 +22533,7 @@ esac
freebsd*|dragonfly*) :
SOLIBS='$(LIBS)'
@@ -53,7 +81,54 @@ $NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
-@@ -22534,7 +22542,12 @@ esac
+@@ -22524,7 +22543,17 @@ esac
+
+ SOLIBS='$(LIBS)'
+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
+- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR"
++ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
++ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' "$LDFLAGS_OPTDIR"; do
++ case " ${LIBRUBY_DLDFLAGS-} " in #(
++ *" ${rb_opt} "*) :
++ ;; #(
++ ' ') :
++ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
++ *) :
++ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
++esac
++ done
+ if test "$rb_cv_binary_elf" = yes; then # ELF platforms
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
+ else # a.out platforms
+@@ -22556,7 +22585,17 @@ esac
+ ;; #(
+ aix*) :
+
+- LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR"
++ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
++ for rb_opt in "${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"; do
++ case " ${LIBRUBY_DLDFLAGS-} " in #(
++ *" ${rb_opt} "*) :
++ ;; #(
++ ' ') :
++ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
++ *) :
++ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
++esac
++ done
+ LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
+ SOLIBS='-lm -lc'
+ ;; #(
+@@ -22565,7 +22604,7 @@ esac
+ case "$target_cpu" in #(
+ powerpc*) :
+
+- LIBRUBY_DLDFLAGS="-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
++ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS -f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
+ ;; #(
+ *) :
+ ;;
+@@ -22593,7 +22632,12 @@ esac
;; #(
interix*) :
@@ -67,7 +142,7 @@ $NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
;; #(
mingw*|cygwin*|mswin*) :
-@@ -22707,7 +22720,7 @@ if test "$enable_rpath" = yes; then
+@@ -22766,7 +22810,7 @@ if test "$enable_rpath" = yes; then
esac
rpathflag=`IFS="$PATH_SEPARATOR"
echo x "$rpathflag" |
@@ -76,7 +151,7 @@ $NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
`
LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -23026,11 +23039,7 @@ if test "$install_doc" != no; then
+@@ -23085,11 +23129,7 @@ if test "$install_doc" != no; then
else
RDOCTARGET="nodoc"
fi
@@ -89,7 +164,7 @@ $NetBSD: patch-configure,v 1.4 2016/05/15 14:07:48 taca Exp $
else
RDOCTARGET="nodoc"
CAPITARGET="nodoc"
-@@ -25136,17 +25145,7 @@ which seems to be undefined. Please mak
+@@ -25195,17 +25235,7 @@ which seems to be undefined. Please mak
"Makefile":F)
tmpmk=confmk$$.tmp
{