diff options
Diffstat (limited to 'poky/meta/recipes-devtools/ruby')
-rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby.inc | 13 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 14 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch | 17 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby_3.0.0.bb (renamed from poky/meta/recipes-devtools/ruby/ruby_2.7.2.bb) | 4 |
5 files changed, 26 insertions, 60 deletions
diff --git a/poky/meta/recipes-devtools/ruby/ruby.inc b/poky/meta/recipes-devtools/ruby/ruby.inc index a38b3fe624..1cede8d47c 100644 --- a/poky/meta/recipes-devtools/ruby/ruby.inc +++ b/poky/meta/recipes-devtools/ruby/ruby.inc @@ -7,14 +7,13 @@ It is simple, straight-forward, and extensible. \ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=5b8c87559868796979806100db3f3805 \ - file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ - file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ -" +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ + file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ + file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LEGAL;md5=cfe5b0bc9f051b58c7e78db882ca5f9b \ + " -DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" +DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" diff --git a/poky/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/poky/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch deleted file mode 100644 index f316bed7bd..0000000000 --- a/poky/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch +++ /dev/null @@ -1,38 +0,0 @@ -From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@cn.fujitsu.com> -Date: Sat, 8 Feb 2020 15:16:14 +0800 -Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. - -change /usr/local/bin/ruby to /usr/bin/env ruby. - -Upstream-Status: Pending - -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> ---- - libexec/racc2y | 2 +- - libexec/y2racc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libexec/racc2y b/libexec/racc2y -index f88d73ed2c..74e49cfa21 100755 ---- a/libexec/racc2y -+++ b/libexec/racc2y -@@ -1,4 +1,4 @@ --#!/usr/local/bin/ruby -+#!/usr/bin/env ruby - # - # $Id$ - # -diff --git a/libexec/y2racc b/libexec/y2racc -index 7933f94153..36daf864e1 100755 ---- a/libexec/y2racc -+++ b/libexec/y2racc -@@ -1,4 +1,4 @@ --#!/usr/local/bin/ruby -+#!/usr/bin/env ruby - # - # $Id$ - # --- -2.17.1 - diff --git a/poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index b31dee1128..4b954e439b 100644 --- a/poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -1,27 +1,25 @@ -From 6d608326970b1613633d7715ebb7d628dfcd16ee Mon Sep 17 00:00:00 2001 +From 07fd1ada322eda6c05ac45c08fc814976f31b596 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/3] Obey LDFLAGS for the link of libruby +Subject: [PATCH] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson <chris_larson@mentor.com> Upstream-Status: Pending + --- template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/Makefile.in b/template/Makefile.in -index fa1e19ef37..bbd07fa34b 100644 +index f5a3149..5cc75ae 100644 --- a/template/Makefile.in +++ b/template/Makefile.in -@@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ - ENABLE_SHARED = @ENABLE_SHARED@ +@@ -114,7 +114,7 @@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ DLDSHARED = @DLDSHARED@ + XDLDFLAGS = @DLDFLAGS@ -DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) +DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) SOLIBS = @SOLIBS@ ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ MAINLIBS = @MAINLIBS@ --- -2.23.0.rc1 - diff --git a/poky/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch b/poky/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch index a1e6330445..6e90a8ee77 100644 --- a/poky/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch +++ b/poky/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch @@ -1,4 +1,7 @@ -Filter out __has_include* compiler defines +From 303fe0d20184203f1ac86d2a77b1447d47c8c29d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 26 Jan 2020 11:27:40 -0800 +Subject: [PATCH] Filter out __has_include* compiler defines They are internal to compiler and this header is later on includes in C files, but newer gcc >= 10 complains about it. @@ -13,12 +16,18 @@ error in initial header file: Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/common.mk b/common.mk +index 7633050..422aa9c 100644 --- a/common.mk +++ b/common.mk -@@ -221,6 +221,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT - $(TIMESTAMPDIR)/$(arch)/.time +@@ -233,6 +233,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJE $(ECHO) building $(@F:.time=.h) - $(Q) $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new + $(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \ + $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new + $(Q)sed -i -e "/#define __has_include __has_include/d" $(@F:.time=.h).new + $(Q)sed -i -e "/#define __has_include_next __has_include_next/d" $(@F:.time=.h).new $(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new diff --git a/poky/meta/recipes-devtools/ruby/ruby_2.7.2.bb b/poky/meta/recipes-devtools/ruby/ruby_3.0.0.bb index db6d672985..5e143ee87f 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_2.7.2.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_3.0.0.bb @@ -5,12 +5,10 @@ DEPENDS_append_libc-musl = " libucontext" SRC_URI += " \ file://remove_has_include_macros.patch \ file://run-ptest \ - file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ " -SRC_URI[md5sum] = "2d4a28dcfa38352a627a597f6057c465" -SRC_URI[sha256sum] = "6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4" +SRC_URI[sha256sum] = "a13ed141a1c18eb967aac1e33f4d6ad5f21be1ac543c344e0d6feeee54af8e28" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |