pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2022Q1]: pkgsrc/lang/ruby Pullup ticket #6611 - requested by nia



details:   https://anonhg.NetBSD.org/pkgsrc/rev/223f36dd23fb
branches:  pkgsrc-2022Q1
changeset: 376097:223f36dd23fb
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Apr 02 09:20:32 2022 +0000

description:
Pullup ticket #6611 - requested by nia
lang/ruby: NetBSD/arm build fix

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.245

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Sat Apr  2 07:51:46 UTC 2022

   Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk

   Log Message:
   ruby: Do not append an ABI on NetBSD to the arch-specific extension
   directory. Failure seen in:

   http://victory.netbsd.org/pkgsrc/packages/reports/2022Q1/evbarm7-9.0/20220330.2134/ruby31-base-3.1.1/install.log

diffstat:

 lang/ruby/rubyversion.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 1e7a7d76b5d3 -r 223f36dd23fb lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Sat Apr 02 09:12:30 2022 +0000
+++ b/lang/ruby/rubyversion.mk  Sat Apr 02 09:20:32 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.244 2022/02/23 15:53:25 jperkin Exp $
+# $NetBSD: rubyversion.mk,v 1.244.2.1 2022/04/02 09:20:32 bsiegert Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -622,7 +622,7 @@
 
 # NetBSD does not append an OS version, so we have to do this OPSYS-specific.
 .if ${OPSYS} == "NetBSD"
-RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
+RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
 .else
 RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}-${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
 .endif



Home | Main Index | Thread Index | Old Index