CVS commit: pkgsrc/lang/ruby31-base

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

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

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

Log Message:
ruby31-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.3 -r1.4 pkgsrc/lang/ruby31-base/Makefile \
    pkgsrc/lang/ruby31-base/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby31-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/ruby31-base/Makefile
diff -u pkgsrc/lang/ruby31-base/Makefile:1.3 pkgsrc/lang/ruby31-base/Makefile:1.4
--- pkgsrc/lang/ruby31-base/Makefile:1.3        Sun Feb 20 15:59:09 2022
+++ pkgsrc/lang/ruby31-base/Makefile    Wed May  4 15:49:51 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2022/02/20 15:59:09 taca Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/04 15:49:51 jperkin Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
Index: pkgsrc/lang/ruby31-base/distinfo
diff -u pkgsrc/lang/ruby31-base/distinfo:1.3 pkgsrc/lang/ruby31-base/distinfo:1.4
--- pkgsrc/lang/ruby31-base/distinfo:1.3        Tue Apr 12 15:12:13 2022
+++ pkgsrc/lang/ruby31-base/distinfo    Wed May  4 15:49:51 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2022/04/12 15:12:13 taca Exp $
+$NetBSD: distinfo,v 1.4 2022/05/04 15:49:51 jperkin Exp $
 
 BLAKE2s (ruby-3.1.2.tar.xz) = 5384cfebbd466de36f68f554be2c045363e6c074d90a94a4c035ecaadf3c878b
 SHA512 (ruby-3.1.2.tar.xz) = 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
 Size (ruby-3.1.2.tar.xz) = 15101588 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
-SHA1 (patch-configure) = c8a09d995d9d09c1142f22cf59f04fa61b528a2a
+SHA1 (patch-configure) = 3da2fffeaf717e241e9e3b12ad627d09375790da
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
 SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335
 SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a

Index: pkgsrc/lang/ruby31-base/patches/patch-configure
diff -u pkgsrc/lang/ruby31-base/patches/patch-configure:1.1 pkgsrc/lang/ruby31-base/patches/patch-configure:1.2
--- pkgsrc/lang/ruby31-base/patches/patch-configure:1.1 Sun Jan 16 13:57:10 2022
+++ pkgsrc/lang/ruby31-base/patches/patch-configure     Wed May  4 15:49:51 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2022/01/16 13:57:10 taca Exp $
+$NetBSD: patch-configure,v 1.2 2022/05/04 15:49:51 jperkin Exp $
 
 * Avoid bash specific variable substitution.
 * 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.
 * Explictly stop display with color.
 
---- configure.orig     2021-12-25 12:23:16.000000000 +0000
+--- configure.orig     2022-04-12 11:11:17.000000000 +0000
 +++ configure
 @@ -3316,12 +3316,12 @@ case "$target_cpu-$target_os" in #(
          target_cpu=arm64
@@ -44,7 +44,26 @@ $NetBSD: patch-configure,v 1.1 2022/01/1
       ;;
  esac
      if test -z "${stack_protector+set}"; then :
-@@ -12226,6 +12227,10 @@ esac
+@@ -11981,18 +11982,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
+ 
+@@ -12226,6 +12215,10 @@ esac
  
                        ac_cv_func___builtin_setjmp=no
                 ;; #(
@@ -55,7 +74,7 @@ $NetBSD: patch-configure,v 1.1 2022/01/1
    *) :
       ;;
  esac
-@@ -24059,6 +24064,8 @@ else
+@@ -24059,6 +24052,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -64,7 +83,7 @@ $NetBSD: patch-configure,v 1.1 2022/01/1
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -29499,7 +29506,9 @@ fi
+@@ -29499,7 +29494,9 @@ fi
    interix*) :
        : ${LDSHARED='$(CC) -shared'}
                        XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -74,7 +93,7 @@ $NetBSD: patch-configure,v 1.1 2022/01/1
                        rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -30700,7 +30709,7 @@ fi
+@@ -30700,7 +30697,7 @@ fi
         ;; #(
    freebsd*|dragonfly*) :
  
@@ -83,7 +102,7 @@ $NetBSD: patch-configure,v 1.1 2022/01/1
        LIBRUBY_SONAME='$(LIBRUBY_SO)'
        if test "$rb_cv_binary_elf" != "yes" ; then :
  
-@@ -30795,9 +30804,10 @@ esac
+@@ -30795,9 +30792,10 @@ esac
         ;; #(
    darwin*) :
  
@@ -96,7 +115,7 @@ $NetBSD: patch-configure,v 1.1 2022/01/1
        if test "$load_relative" = yes; then :
  
            libprefix="@executable_path/../${libdir_basename}"
-@@ -30818,7 +30828,12 @@ fi
+@@ -30818,7 +30816,12 @@ fi
         ;; #(
    interix*) :
  
@@ -110,7 +129,7 @@ $NetBSD: patch-configure,v 1.1 2022/01/1
         ;; #(
    cygwin*|msys*|mingw*|mswin*) :
  
-@@ -31000,7 +31015,7 @@ if test "$enable_rpath" = yes; then :
+@@ -31000,7 +31003,7 @@ if test "$enable_rpath" = yes; then :
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -119,7 +138,7 @@ $NetBSD: patch-configure,v 1.1 2022/01/1
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -32550,7 +32565,7 @@ guard=INCLUDE_RUBY_CONFIG_H
+@@ -32550,7 +32553,7 @@ guard=INCLUDE_RUBY_CONFIG_H
    if test "x$CONFIGURE_TTY" = xyes; then :
    color=--color
  else
@@ -128,7 +147,7 @@ $NetBSD: patch-configure,v 1.1 2022/01/1
  fi
    exec ${SHELL} ${tooldir}/ifchange $color "${config_h}" -
  ) >&6 || as_fn_error $? "failed to create ${config_h}" "$LINENO" 5
-@@ -33773,19 +33788,7 @@ which seems to be undefined.  Please mak
+@@ -33773,19 +33776,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {