diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/ruby')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby.inc | 3 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 28 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby_2.2.5.bb (renamed from import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby_2.2.2.bb) | 8 |
3 files changed, 32 insertions, 7 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby.inc b/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby.inc index 313e75222..fde67e940 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby.inc +++ b/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby.inc @@ -20,7 +20,8 @@ DEPENDS_class-native = "openssl-native libyaml-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ file://extmk.patch \ -" + file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \ + " inherit autotools diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch new file mode 100644 index 000000000..b0114ba28 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +From 306e95a9818d39d3349075aac9609e062b0f19ce Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Thu, 5 May 2016 10:59:07 -0700 +Subject: [PATCH 2/2] Obey LDFLAGS for the link of libruby + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 7da2488..5b4aea1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -75,7 +75,7 @@ EXTLIBS = + LIBS = @LIBS@ $(EXTLIBS) + MISSING = @LIBOBJS@ @ALLOCA@ + LDSHARED = @LIBRUBY_LDSHARED@ +-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) ++DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) + SOLIBS = @SOLIBS@ + MAINLIBS = @MAINLIBS@ + ARCHMINIOBJS = @MINIOBJS@ +-- +2.8.0 + diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby_2.2.2.bb b/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby_2.2.5.bb index 671502356..5a645821b 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby_2.2.2.bb +++ b/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby_2.2.5.bb @@ -1,7 +1,7 @@ require ruby.inc -SRC_URI[md5sum] = "326e99ddc75381c7b50c85f7089f3260" -SRC_URI[sha256sum] = "5ffc0f317e429e6b29d4a98ac521c3ce65481bfd22a8cf845fa02a7b113d9b44" +SRC_URI[md5sum] = "bd8e349d4fb2c75d90817649674f94be" +SRC_URI[sha256sum] = "30c4b31697a4ca4ea0c8db8ad30cf45e6690a0f09687e5d483c933c03ca335e3" # it's unknown to configure script, but then passed to extconf.rb # maybe it's not really needed as we're hardcoding the result with @@ -23,10 +23,6 @@ EXTRA_OECONF = "\ --enable-load-relative \ " -EXTRA_OEMAKE = " \ - LIBRUBYARG='-lruby-static' \ -" - do_install() { oe_runmake 'DESTDIR=${D}' install } |