CVS commit: pkgsrc/lang/ruby30-base

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May  4 15:49:16 UTC 2022

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

Log Message:
ruby30-base: Retain _XOPEN_SOURCE on SunOS.

Fixes build of eventmachine (which assumes the XPG4.2 "void *" type for
iov_base), and mirrors settings of ruby 2.x.   Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ruby30-base/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ruby30-base/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby30-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/ruby30-base/Makefile
diff -u pkgsrc/lang/ruby30-base/Makefile:1.6 pkgsrc/lang/ruby30-base/Makefile:1.7
--- pkgsrc/lang/ruby30-base/Makefile:1.6        Tue Apr 12 14:52:27 2022
+++ pkgsrc/lang/ruby30-base/Makefile    Wed May  4 15:49:16 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2022/04/12 14:52:27 taca Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/04 15:49:16 jperkin Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby30-base/distinfo
diff -u pkgsrc/lang/ruby30-base/distinfo:1.8 pkgsrc/lang/ruby30-base/distinfo:1.9
--- pkgsrc/lang/ruby30-base/distinfo:1.8        Tue Apr 12 14:52:27 2022
+++ pkgsrc/lang/ruby30-base/distinfo    Wed May  4 15:49:16 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2022/04/12 14:52:27 taca Exp $
+$NetBSD: distinfo,v 1.9 2022/05/04 15:49:16 jperkin Exp $
 
 BLAKE2s (ruby-3.0.4.tar.xz) = 2487d6f4bd37ef20715935a50d2cc50f9d50589c9223836bfaa6c3ac7de57b4d
 SHA512 (ruby-3.0.4.tar.xz) = 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b
 Size (ruby-3.0.4.tar.xz) = 15830368 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
-SHA1 (patch-configure) = a56184876caac5c24b2c2925f364d88c3ebc5662
+SHA1 (patch-configure) = 8499cad3c1fb1a1b15392ba375f8d4e737fef2e4
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
 SHA1 (patch-ext_openssl_ossl__pkey__rsa.c) = 32054bad7bf31040e6d8828f8786de26dc860518

Index: pkgsrc/lang/ruby30-base/patches/patch-configure
diff -u pkgsrc/lang/ruby30-base/patches/patch-configure:1.1 pkgsrc/lang/ruby30-base/patches/patch-configure:1.2
--- pkgsrc/lang/ruby30-base/patches/patch-configure:1.1 Sun Feb 14 14:32:41 2021
+++ pkgsrc/lang/ruby30-base/patches/patch-configure     Wed May  4 15:49:16 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2021/02/14 14:32:41 taca Exp $
+$NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
 * Ignore VCS.
 * Handle SSP in pkgsrc.
-* Put -std= in CFLAGS not CPPFLAGS.
+* Retain _XOPEN_SOURCE, fixes eventmachine.
 * Fix argument for pthread_self() on NetBSD.
 
---- configure.orig     2020-12-08 09:02:33.000000000 +0000
+--- configure.orig     2022-04-12 11:48:57.000000000 +0000
 +++ configure
-@@ -7991,7 +7991,7 @@ else
+@@ -8381,7 +8381,7 @@ else
      if test x"$target_alias" = x; then :
  
        case "$target_os" in #(
@@ -18,7 +18,7 @@ $NetBSD: patch-configure,v 1.1 2021/02/1
  
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
  $as_echo_n "checking for real target cpu... " >&6; }
-@@ -10048,6 +10048,7 @@ fi
+@@ -10094,6 +10094,7 @@ fi
        stack_protector=no
       ;; #(
    *) :
@@ -26,7 +26,26 @@ $NetBSD: patch-configure,v 1.1 2021/02/1
       ;;
  esac
      if test -z "${stack_protector+set}"; then :
-@@ -11912,6 +11913,10 @@ esac
+@@ -11794,18 +11795,6 @@ fi
+      CPPFLAGS="$CPPFLAGS ${rb_opt}" ;;
+ esac
+       done
+-                  # _XOPEN_SOURCE should not be defined for C++ on Solaris.
+-                  # RUBY_APPEND_OPTIONS(CXXFLAGS)
+-      for rb_opt in -U_XOPEN_SOURCE; do
+-      case " ${CXXFLAGS-} " in #(
+-  *" ${rb_opt} "*) :
+-     ;; #(
+-  '  ') :
+-     CXXFLAGS="${rb_opt}" ;; #(
+-  *) :
+-     CXXFLAGS="$CXXFLAGS ${rb_opt}" ;;
+-esac
+-      done
+ 
+ fi
+ 
+@@ -11970,6 +11959,10 @@ esac
  
                        ac_cv_func___builtin_setjmp=no
                 ;; #(
@@ -37,7 +56,7 @@ $NetBSD: patch-configure,v 1.1 2021/02/1
    *) :
       ;;
  esac
-@@ -23493,6 +23498,8 @@ else
+@@ -23324,6 +23317,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -46,7 +65,7 @@ $NetBSD: patch-configure,v 1.1 2021/02/1
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -28791,7 +28798,9 @@ fi
+@@ -28622,7 +28617,9 @@ fi
    interix*) :
        : ${LDSHARED='$(CC) -shared'}
                        XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -56,7 +75,7 @@ $NetBSD: patch-configure,v 1.1 2021/02/1
                        rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -29988,7 +29997,7 @@ fi
+@@ -29890,7 +29887,7 @@ fi
         ;; #(
    freebsd*|dragonfly*) :
  
@@ -65,7 +84,7 @@ $NetBSD: patch-configure,v 1.1 2021/02/1
        LIBRUBY_SONAME='$(LIBRUBY_SO)'
        if test "$rb_cv_binary_elf" != "yes" ; then :
  
-@@ -30067,9 +30076,10 @@ esac
+@@ -29969,9 +29966,10 @@ esac
         ;; #(
    darwin*) :
  
@@ -78,7 +97,7 @@ $NetBSD: patch-configure,v 1.1 2021/02/1
        if test "$load_relative" = yes; then :
  
            libprefix="@executable_path/../${libdir_basename}"
-@@ -30090,7 +30100,12 @@ fi
+@@ -29992,7 +29990,12 @@ fi
         ;; #(
    interix*) :
  
@@ -92,7 +111,7 @@ $NetBSD: patch-configure,v 1.1 2021/02/1
         ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -30272,7 +30287,7 @@ if test "$enable_rpath" = yes; then :
+@@ -30174,7 +30177,7 @@ if test "$enable_rpath" = yes; then :
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -101,7 +120,7 @@ $NetBSD: patch-configure,v 1.1 2021/02/1
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -32996,19 +33011,7 @@ which seems to be undefined.  Please mak
+@@ -32906,19 +32909,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {