CVS commit: pkgsrc/lang/ruby23-base

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jan 26 10:54:15 UTC 2018

Modified Files:
        pkgsrc/lang/ruby23-base: Makefile distinfo
        pkgsrc/lang/ruby23-base/patches: patch-configure

Log Message:
ruby23-base: Don't add -std=iso9899:1999 to CPPFLAGS, invalid for C++.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ruby23-base/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ruby23-base/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ruby23-base/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby23-base/Makefile
diff -u pkgsrc/lang/ruby23-base/Makefile:1.11 pkgsrc/lang/ruby23-base/Makefile:1.12
--- pkgsrc/lang/ruby23-base/Makefile:1.11       Fri Sep 15 00:36:17 2017
+++ pkgsrc/lang/ruby23-base/Makefile    Fri Jan 26 10:54:15 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2017/09/15 00:36:17 taca Exp $
+# $NetBSD: Makefile,v 1.12 2018/01/26 10:54:15 jperkin Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby23-base/distinfo
diff -u pkgsrc/lang/ruby23-base/distinfo:1.12 pkgsrc/lang/ruby23-base/distinfo:1.13
--- pkgsrc/lang/ruby23-base/distinfo:1.12       Tue Jan 16 14:53:27 2018
+++ pkgsrc/lang/ruby23-base/distinfo    Fri Jan 26 10:54:15 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2018/01/16 14:53:27 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2018/01/26 10:54:15 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) = 90f18fa8a591a9b913d6b95bc55756ba913e6599
+SHA1 (patch-configure) = 0088c4794a65ee1131b3060b09b82851bba43f28
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-ext_openssl_ossl__ssl.c) = 24e794aae278da6204e29212d9e2add0b0119ea4
 SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e

Index: pkgsrc/lang/ruby23-base/patches/patch-configure
diff -u pkgsrc/lang/ruby23-base/patches/patch-configure:1.5 pkgsrc/lang/ruby23-base/patches/patch-configure:1.6
--- pkgsrc/lang/ruby23-base/patches/patch-configure:1.5 Tue Jan 16 14:53:27 2018
+++ pkgsrc/lang/ruby23-base/patches/patch-configure     Fri Jan 26 10:54:15 2018
@@ -1,9 +1,10 @@
-$NetBSD: patch-configure,v 1.5 2018/01/16 14:53:27 jperkin Exp $
+$NetBSD: patch-configure,v 1.6 2018/01/26 10:54:15 jperkin Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
 * Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
 * Handle SSP in pkgsrc.
+* Don't add -std=iso9899:1999 to CPPFLAGS, invalid for C++.
 
 --- configure.orig     2017-12-14 14:57:48.000000000 +0000
 +++ configure
@@ -33,6 +34,15 @@ $NetBSD: patch-configure,v 1.5 2018/01/1
       ;;
  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
 @@ -9319,6 +9322,10 @@ esac
        LIBS="-lm $LIBS"
                ac_cv_func_round=no