ruby*-base: Don't add SSP flags, leave that to pkgsrc.

2 files changed, 21 insertions, 12 deletions

diff --git a/lang/ruby25-base/distinfo b/lang/ruby25-base/distinfo
index cd43b47ec27..d150ee5afd8 100644
--- a/lang/ruby25-base/distinfo
+++ b/lang/ruby25-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2018/01/08 14:19:06 taca Exp $
+$NetBSD: distinfo,v 1.2 2018/01/16 14:53:28 jperkin Exp $
 
 SHA1 (ruby-2.5.0.tar.bz2) = 827b9a3bcffa86d1fc9ed96d403cb9dc37731688
 RMD160 (ruby-2.5.0.tar.bz2) = e09d8b3f89d3b494231026cf1295c5bf5da794e5
 SHA512 (ruby-2.5.0.tar.bz2) = 8f6fdf6708e7470f55bc009db2567cd8d4e633ad0678d83a015441ecf5b5d88bd7da8fb8533a42157ff83b74d00b6dc617d39bbb17fc2c6c12287a1d8eaa0f2c
 Size (ruby-2.5.0.tar.bz2) = 13955820 bytes
-SHA1 (patch-configure) = 8e997449685b8454c8c7281a3492d287b2ed3e5c
+SHA1 (patch-configure) = 347bdd41a2529cfe77ffbe053a6941756dffe694
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e
 SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198
diff --git a/lang/ruby25-base/patches/patch-configure b/lang/ruby25-base/patches/patch-configure
index 39a5d3ccc82..4665085751c 100644
--- a/lang/ruby25-base/patches/patch-configure
+++ b/lang/ruby25-base/patches/patch-configure
@@ -1,8 +1,9 @@
-$NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
+$NetBSD: patch-configure,v 1.2 2018/01/16 14:53:28 jperkin Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
 * Ignore VCS.
+* Handle SSP in pkgsrc.
 
 --- configure.orig	2017-12-25 07:00:28.000000000 +0000
 +++ configure
@@ -15,7 +16,15 @@ $NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
  
  	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
  $as_echo_n "checking for real target cpu... " >&6; }
-@@ -9295,7 +9295,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -7873,6 +7873,7 @@ fi
+ 	stack_protector=no
+      ;; #(
+   *) :
++	stack_protector=no
+      ;;
+ esac
+     if test -z "${stack_protector+set}"; then :
+@@ -9295,7 +9296,7 @@ rm -f core conftest.err conftest.$ac_obj
  		  # is often also needed in CPPFLAGS, because some feature
  		  # definitions vary depending on such standards options.
  		  case "${ansi_options}" in #(
@@ -24,7 +33,7 @@ $NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
  
  		    # RUBY_APPEND_OPTIONS(CPPFLAGS)
  	for rb_opt in ${ansi_options}; do
-@@ -9536,6 +9536,10 @@ esac
+@@ -9536,6 +9537,10 @@ esac
      	LIBS="-lm $LIBS"
  		ac_cv_func_round=no
  		 ;; #(
@@ -35,7 +44,7 @@ $NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
    *) :
      	LIBS="-lm $LIBS" ;;
  esac
-@@ -20224,6 +20228,8 @@ else
+@@ -20224,6 +20229,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -44,7 +53,7 @@ $NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -24996,7 +25002,9 @@ fi
+@@ -24996,7 +25003,9 @@ fi
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -54,7 +63,7 @@ $NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -26229,7 +26237,7 @@ fi
+@@ -26229,7 +26238,7 @@ fi
    freebsd*|dragonfly*) :
  
  	SOLIBS='$(LIBS)'
@@ -63,7 +72,7 @@ $NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
  	if test "$rb_cv_binary_elf" != "yes" ; then :
  
-@@ -26334,7 +26342,12 @@ fi
+@@ -26334,7 +26343,12 @@ fi
  	 ;; #(
    interix*) :
  
@@ -77,7 +86,7 @@ $NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
  	 ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -26516,7 +26529,7 @@ if test "$enable_rpath" = yes; then :
+@@ -26516,7 +26530,7 @@ if test "$enable_rpath" = yes; then :
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -86,7 +95,7 @@ $NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -27058,15 +27071,7 @@ fi
+@@ -27058,15 +27072,7 @@ fi
  
  if test "$install_doc" != no; then :
  
@@ -103,7 +112,7 @@ $NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $
      if test "$install_capi" != no -a -n "$DOXYGEN"; then :
  
  	CAPITARGET="capi"
-@@ -29143,31 +29148,7 @@ which seems to be undefined.  Please mak
+@@ -29143,31 +29149,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {