summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2018-01-26 11:53:09 +0000
committerjperkin <jperkin@pkgsrc.org>2018-01-26 11:53:09 +0000
commit8da474428fb7741921a09350378ee6ef4a1a26b3 (patch)
tree6bcb4b5b3156493ec8ba3ed3d955f921d620e406
parentc019a569dca1fa4deca4bd4d9726f65cf9a36f93 (diff)
downloadpkgsrc-8da474428fb7741921a09350378ee6ef4a1a26b3.tar.gz
ruby23-base: Change previous to set CFLAGS instead, ride revbump.
-rw-r--r--lang/ruby23-base/distinfo4
-rw-r--r--lang/ruby23-base/patches/patch-configure23
2 files changed, 15 insertions, 12 deletions
diff --git a/lang/ruby23-base/distinfo b/lang/ruby23-base/distinfo
index 55975184efb..6de21edcade 100644
--- a/lang/ruby23-base/distinfo
+++ b/lang/ruby23-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2018/01/26 10:54:15 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2018/01/26 11:53:09 jperkin Exp $
SHA1 (ruby-2.3.6.tar.bz2) = 07c3b66d544dd22c22fbae3f16cfb3eeb88b7b1e
RMD160 (ruby-2.3.6.tar.bz2) = 664e027a6f172212ac8ebff3aa9b99df4e99906b
SHA512 (ruby-2.3.6.tar.bz2) = bc3c7a115745a38e44bd91eb5637b1e412011c471d9749db7960185ef75737b944dd0e524f22432809649952ca7d93f46d458990e9cd2b0db5ca8abf4bc8ea99
Size (ruby-2.3.6.tar.bz2) = 14429114 bytes
-SHA1 (patch-configure) = 0088c4794a65ee1131b3060b09b82851bba43f28
+SHA1 (patch-configure) = 3737bf52082288b02e7382d71a322f4822c5abe4
SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
SHA1 (patch-ext_openssl_ossl__ssl.c) = 24e794aae278da6204e29212d9e2add0b0119ea4
SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e
diff --git a/lang/ruby23-base/patches/patch-configure b/lang/ruby23-base/patches/patch-configure
index dcc3922ce86..39b8c4213bd 100644
--- a/lang/ruby23-base/patches/patch-configure
+++ b/lang/ruby23-base/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.6 2018/01/26 10:54:15 jperkin Exp $
+$NetBSD: patch-configure,v 1.7 2018/01/26 11:53:09 jperkin Exp $
* Adding Interix support.
* Ignore doxygen.
@@ -34,15 +34,18 @@ $NetBSD: patch-configure,v 1.6 2018/01/26 10:54:15 jperkin Exp $
;;
esac
if test -z "${stack_protector+set}"; then
-@@ -9105,7 +9108,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 #(
-- *-std=iso9899:1999*) :
-+ *-std=disabled-iso9899:1999*) :
-
- # RUBY_APPEND_OPTIONS(CPPFLAGS)
- for rb_opt in ${ansi_options}; do
+@@ -9113,9 +9116,9 @@ rm -f core conftest.err conftest.$ac_obj
+ *" ${rb_opt} "*) :
+ ;; #(
+ ' ') :
+- CPPFLAGS="${rb_opt}" ;; #(
++ CFLAGS="${rb_opt}" ;; #(
+ *) :
+- CPPFLAGS="$CPPFLAGS ${rb_opt}" ;;
++ CFLAGS="$CFLAGS ${rb_opt}" ;;
+ esac
+ done
+ ;; #(
@@ -9319,6 +9322,10 @@ esac
LIBS="-lm $LIBS"
ac_cv_func_round=no