pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/ruby-ffi-compiler devel/ruby-ffi-compiler: fix r...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fb8f8fb21e6
branches:  trunk
changeset: 441390:3fb8f8fb21e6
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Nov 02 15:13:27 2020 +0000

description:
devel/ruby-ffi-compiler: fix runtime problem

Install loadable modules into GEM_EXTSDIR.

On some platform, ruby-ffi/ruby-ffi-compiler defines their own OS/ARCH name
and it cause using diffrernt directory to install loadable modules.

In this case (NetBSD/i386), installed loadable modules never loaded
successfully since they exists on a directory which dose not contained in
Ruby's global variable "$:".

Focus to PR pkg/55469.

Bump PKGREVISION.

diffstat:

 devel/ruby-ffi-compiler/Makefile                                        |   3 +-
 devel/ruby-ffi-compiler/distinfo                                        |   3 +-
 devel/ruby-ffi-compiler/patches/patch-lib_ffi-compiler_compile__task.rb |  16 ++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r ae049271f58c -r 3fb8f8fb21e6 devel/ruby-ffi-compiler/Makefile
--- a/devel/ruby-ffi-compiler/Makefile  Mon Nov 02 14:48:18 2020 +0000
+++ b/devel/ruby-ffi-compiler/Makefile  Mon Nov 02 15:13:27 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/01/18 23:30:40 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/02 15:13:27 taca Exp $
 
 DISTNAME=      ffi-compiler-1.0.1
+PKGREVISION=   1
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r ae049271f58c -r 3fb8f8fb21e6 devel/ruby-ffi-compiler/distinfo
--- a/devel/ruby-ffi-compiler/distinfo  Mon Nov 02 14:48:18 2020 +0000
+++ b/devel/ruby-ffi-compiler/distinfo  Mon Nov 02 15:13:27 2020 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/01/16 14:36:15 taca Exp $
+$NetBSD: distinfo,v 1.2 2020/11/02 15:13:27 taca Exp $
 
 SHA1 (ffi-compiler-1.0.1.gem) = 51cf896232764a4bc0ffad439f416749f1b4f34b
 RMD160 (ffi-compiler-1.0.1.gem) = f2c24bc3081db02f90edfb78b73475bf9aaf5f35
 SHA512 (ffi-compiler-1.0.1.gem) = 7a13625ab1c5748d05ec93d68708dd9435ec92dcd0c823109c44173fdaf8710aec5f5b4fb11966475f10ae91401c7ca3c620f9d36bb9ca665114e1ed70f4edd0
 Size (ffi-compiler-1.0.1.gem) = 18432 bytes
+SHA1 (patch-lib_ffi-compiler_compile__task.rb) = a29a3bbb2d3d4f622374ae90b957ad2839caf7ea
diff -r ae049271f58c -r 3fb8f8fb21e6 devel/ruby-ffi-compiler/patches/patch-lib_ffi-compiler_compile__task.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ruby-ffi-compiler/patches/patch-lib_ffi-compiler_compile__task.rb   Mon Nov 02 15:13:27 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_ffi-compiler_compile__task.rb,v 1.1 2020/11/02 15:13:27 taca Exp $
+
+Do not use FFI::Compiler::Platform own definition and use
+RbConfig::CONFIG['arch'] instead.
+
+--- lib/ffi-compiler/compile_task.rb.orig      2020-11-02 14:39:47.900421091 +0000
++++ lib/ffi-compiler/compile_task.rb
+@@ -95,7 +95,7 @@ module FFI
+         end
+         so_flags = so_flags.join(' ')
+ 
+-        out_dir = "#{@platform.arch}-#{@platform.os}"
++        out_dir = RbConfig::CONFIG['arch']
+         if @ext_dir != '.'
+           out_dir = File.join(@ext_dir, out_dir)
+         end



Home | Main Index | Thread Index | Old Index