Initial commit
This commit is contained in:
+34
@@ -0,0 +1,34 @@
|
||||
From a6e12b25a54d112c899b70c89c0bec9c5e5ebf3c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
|
||||
Date: Mon, 30 Sep 2019 16:57:01 +0100
|
||||
Subject: [PATCH 1/3] extmk: fix cross-compilation of external gems
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Note that I (André) didn't actually write this patch, I
|
||||
only updated it so that git-am works.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: André Draszik <andre.draszik@jci.com>
|
||||
---
|
||||
ext/extmk.rb | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ext/extmk.rb b/ext/extmk.rb
|
||||
index 1389dc4117..e4d923d7a7 100755
|
||||
--- a/ext/extmk.rb
|
||||
+++ b/ext/extmk.rb
|
||||
@@ -413,8 +413,8 @@ def $mflags.defined?(var)
|
||||
end
|
||||
$ruby = [$ruby]
|
||||
$ruby << "-I'$(topdir)'"
|
||||
+$ruby << "-I'$(top_srcdir)/lib'"
|
||||
unless CROSS_COMPILING
|
||||
- $ruby << "-I'$(top_srcdir)/lib'"
|
||||
$ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout
|
||||
ENV["RUBYLIB"] = "-"
|
||||
end
|
||||
--
|
||||
2.23.0.rc1
|
||||
|
||||
+52
@@ -0,0 +1,52 @@
|
||||
From 6b3c202b46b9312c5bb0789145f13d8086e70948 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 15 Jan 2023 02:34:17 -0800
|
||||
Subject: [PATCH] fiddle: Use C11 _Alignof to define ALIGN_OF when possible
|
||||
|
||||
WG14 N2350 made very clear that it is an UB having type definitions
|
||||
within "offsetof" [1]. This patch enhances the implementation of macro
|
||||
ALIGN_OF to use builtin "_Alignof" to avoid undefined behavior
|
||||
when using std=c11 or newer
|
||||
|
||||
clang 16+ has started to flag this [2]
|
||||
|
||||
Fixes build when using -std >= gnu11 and using clang16+
|
||||
|
||||
Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it
|
||||
may support C11, exclude those compiler versions
|
||||
|
||||
[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm
|
||||
[2] https://reviews.llvm.org/D133574
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/ruby/fiddle/pull/120]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
ext/fiddle/fiddle.h | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
|
||||
index 10eb9ce..ffb395e 100644
|
||||
--- a/ext/fiddle/fiddle.h
|
||||
+++ b/ext/fiddle/fiddle.h
|
||||
@@ -196,7 +196,17 @@
|
||||
#endif
|
||||
#define TYPE_UINTPTR_T (-TYPE_INTPTR_T)
|
||||
|
||||
-#define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
|
||||
+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023
|
||||
+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
|
||||
+ clang versions < 8.0.0 have the same bug. */
|
||||
+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
|
||||
+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
|
||||
+ && !defined __clang__) \
|
||||
+ || (defined __clang__ && __clang_major__ < 8))
|
||||
+# define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
|
||||
+#else
|
||||
+# define ALIGN_OF(type) _Alignof(type)
|
||||
+#endif
|
||||
|
||||
#define ALIGN_VOIDP ALIGN_OF(void*)
|
||||
#define ALIGN_CHAR ALIGN_OF(char)
|
||||
--
|
||||
2.39.0
|
||||
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
From 2368d07660a93a2c41d63f3ab6054ca4daeef820 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 17 Nov 2020 18:31:40 +0000
|
||||
Subject: [PATCH] template/Makefile.in: do not write host cross-cc items into
|
||||
target config
|
||||
|
||||
This helps reproducibility.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
template/Makefile.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/template/Makefile.in b/template/Makefile.in
|
||||
index 10dc826..940ee07 100644
|
||||
--- a/template/Makefile.in
|
||||
+++ b/template/Makefile.in
|
||||
@@ -657,11 +657,11 @@ mjit_config.h:
|
||||
echo '#endif'; \
|
||||
quote MJIT_MIN_HEADER_NAME "$(MJIT_MIN_HEADER_NAME)"; \
|
||||
sep=,; \
|
||||
- quote "MJIT_CC_COMMON " $(MJIT_CC); \
|
||||
+ quote "MJIT_CC_COMMON " ; \
|
||||
quote "MJIT_CFLAGS MJIT_ARCHFLAG" $(MJIT_CFLAGS); \
|
||||
quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \
|
||||
quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \
|
||||
- quote "MJIT_LDSHARED " $(MJIT_LDSHARED); \
|
||||
+ quote "MJIT_LDSHARED " ; \
|
||||
quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \
|
||||
quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \
|
||||
quote 'PRELOADENV "@PRELOADENV@"'; \
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
From dfb22e4d6662bf72879eda806eaa78c7b52b519e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 25 Jan 2022 20:29:14 -0800
|
||||
Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv
|
||||
|
||||
These defines are missing in musl, there is a possible
|
||||
patch to add them to musl, but we need a full list of
|
||||
these names for mcontext that can be added once for all
|
||||
|
||||
Upstream-Status: Inappropriate [musl bug]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
vm_dump.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/vm_dump.c b/vm_dump.c
|
||||
index a98f5aa..957b785 100644
|
||||
--- a/vm_dump.c
|
||||
+++ b/vm_dump.c
|
||||
@@ -39,6 +39,11 @@
|
||||
|
||||
#define MAX_POSBUF 128
|
||||
|
||||
+#if defined(__riscv) && !defined(__GLIBC__)
|
||||
+# define REG_S1 9
|
||||
+# define REG_S2 18
|
||||
+#endif
|
||||
+
|
||||
#define VM_CFP_CNT(ec, cfp) \
|
||||
((rb_control_frame_t *)((ec)->vm_stack + (ec)->vm_stack_size) - \
|
||||
(rb_control_frame_t *)(cfp))
|
||||
--
|
||||
2.35.0
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From 21d8e7700fa0a9c4bf569dd366134060ae858832 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] 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 1456313..15b98a4 100644
|
||||
--- a/template/Makefile.in
|
||||
+++ b/template/Makefile.in
|
||||
@@ -127,7 +127,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 = $(YJIT_LIBS) @MAINLIBS@
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
Subject: [PATCH] template/Makefile.in: filter out -f*prefix-map
|
||||
|
||||
If we add DEBUG_PREFIX_MAP into LDFLAGS, ruby and ruby-dbg are no longer
|
||||
reproducible. Fix this.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
|
||||
---
|
||||
--- a/tool/mjit_archflag.sh
|
||||
+++ b/tool/mjit_archflag.sh
|
||||
@@ -7,6 +7,20 @@ quote() {
|
||||
echo
|
||||
}
|
||||
|
||||
+quote_filtered() {
|
||||
+ printf "#${indent}define $1"
|
||||
+ while shift && [ "$#" -gt 0 ]; do
|
||||
+ case "$1" in
|
||||
+ -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*)
|
||||
+ ;;
|
||||
+ *)
|
||||
+ printf ' "%s"'$sep "$1"
|
||||
+ ;;
|
||||
+ esac
|
||||
+ done
|
||||
+ echo
|
||||
+}
|
||||
+
|
||||
archs=""
|
||||
arch_flag=""
|
||||
|
||||
--- a/template/Makefile.in
|
||||
+++ b/template/Makefile.in
|
||||
@@ -666,7 +666,7 @@ mjit_config.h:
|
||||
quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \
|
||||
quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \
|
||||
quote "MJIT_LDSHARED " ; \
|
||||
- quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \
|
||||
+ quote_filtered "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \
|
||||
quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \
|
||||
quote 'PRELOADENV "@PRELOADENV@"'; \
|
||||
indent=$${archs:+' '}; \
|
||||
@@ -0,0 +1,35 @@
|
||||
From: Christian Hofstaedtler <zeha@debian.org>
|
||||
Date: Tue, 10 Oct 2017 15:04:34 -0300
|
||||
Subject: rdoc: build reproducible documentation
|
||||
|
||||
- provide a fixed timestamp to the gzip compression
|
||||
|
||||
Upstream-Status: Backport [debian]
|
||||
|
||||
Signed-off-by: Antonio Terceiro <terceiro@debian.org>
|
||||
Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
|
||||
---
|
||||
lib/rdoc/generator/json_index.rb | 4 ++--
|
||||
lib/rdoc/rdoc.rb | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/lib/rdoc/generator/json_index.rb
|
||||
+++ b/lib/rdoc/generator/json_index.rb
|
||||
@@ -178,7 +178,7 @@
|
||||
debug_msg "Writing gzipped search index to %s" % outfile
|
||||
|
||||
Zlib::GzipWriter.open(outfile) do |gz|
|
||||
- gz.mtime = File.mtime(search_index_file)
|
||||
+ gz.mtime = -1
|
||||
gz.orig_name = search_index_file.basename.to_s
|
||||
gz.write search_index
|
||||
gz.close
|
||||
@@ -196,7 +196,7 @@
|
||||
debug_msg "Writing gzipped file to %s" % outfile
|
||||
|
||||
Zlib::GzipWriter.open(outfile) do |gz|
|
||||
- gz.mtime = File.mtime(dest)
|
||||
+ gz.mtime = -1
|
||||
gz.orig_name = dest.basename.to_s
|
||||
gz.write data
|
||||
gz.close
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
From: Reiner Herrmann <reiner@reiner-h.de>
|
||||
Date: Tue, 10 Oct 2017 15:06:13 -0300
|
||||
Subject: lib/mkmf.rb: sort list of object files in generated Makefile
|
||||
|
||||
Without sorting the list explicitly, its order is indeterministic,
|
||||
because readdir() is also not deterministic.
|
||||
When the list of object files varies between builds, they are linked
|
||||
in a different order, which results in an unreproducible build.
|
||||
|
||||
Upstream-Status: Backport [debian]
|
||||
|
||||
Signed-off-by: Antonio Terceiro <terceiro@debian.org>
|
||||
Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>
|
||||
---
|
||||
lib/mkmf.rb | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/lib/mkmf.rb
|
||||
+++ b/lib/mkmf.rb
|
||||
@@ -2315,7 +2315,7 @@
|
||||
LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
|
||||
ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
|
||||
SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}
|
||||
-OBJS = #{$objs.join(" ")}
|
||||
+OBJS = #{$objs.sort.join(" ")}
|
||||
HDRS = #{hdrs.map{|h| '$(srcdir)/' + File.basename(h)}.join(' ')}
|
||||
LOCAL_HDRS = #{$headers.join(' ')}
|
||||
TARGET = #{target}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
From 6e1dc610724a7aa8368cbcddf4bbe21cccc0f731 Mon Sep 17 00:00:00 2001
|
||||
From: Lucas Kanashiro <kanashiro@debian.org>
|
||||
Date: Fri, 1 Nov 2019 15:25:17 -0300
|
||||
Subject: [PATCH] Make gemspecs reproducible
|
||||
|
||||
Without an explicit date, they will get the current date and make the
|
||||
build unreproducible
|
||||
|
||||
Upstream-Status: Backport [debian]
|
||||
---
|
||||
lib/rubygems/specification.rb | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
|
||||
index 0d72cee..eb7bc25 100644
|
||||
--- a/lib/rubygems/specification.rb
|
||||
+++ b/lib/rubygems/specification.rb
|
||||
@@ -1691,7 +1691,9 @@ class Gem::Specification < Gem::BasicSpecification
|
||||
raise(Gem::InvalidSpecificationException,
|
||||
"invalid date format in specification: #{date.inspect}")
|
||||
end
|
||||
- when Time, DateLike then
|
||||
+ when Time then
|
||||
+ Time.utc(date.utc.year, date.utc.month, date.utc.day)
|
||||
+ when DateLike then
|
||||
Time.utc(date.year, date.month, date.day)
|
||||
else
|
||||
TODAY
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
From 3f60710bc29c1b08e128314d40101e87b7d2c9a1 Mon Sep 17 00:00:00 2001
|
||||
From: Lucas Kanashiro <kanashiro@debian.org>
|
||||
Date: Fri, 1 Nov 2019 15:25:17 -0300
|
||||
Subject: [PATCH] Make gemspecs reproducible
|
||||
|
||||
Without an explicit date, they will get the current date and make the
|
||||
build unreproducible
|
||||
|
||||
Upstream-Status: Backport [debian]
|
||||
|
||||
---
|
||||
ext/bigdecimal/bigdecimal.gemspec | 1 +
|
||||
ext/fiddle/fiddle.gemspec | 1 +
|
||||
ext/io/console/io-console.gemspec | 1 +
|
||||
lib/ipaddr.gemspec | 1 +
|
||||
lib/rdoc/rdoc.gemspec | 1 +
|
||||
5 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
|
||||
index d215757..5148d56 100644
|
||||
--- a/ext/bigdecimal/bigdecimal.gemspec
|
||||
+++ b/ext/bigdecimal/bigdecimal.gemspec
|
||||
@@ -4,6 +4,7 @@ Gem::Specification.new do |s|
|
||||
s.name = "bigdecimal"
|
||||
s.version = "3.1.3"
|
||||
s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
|
||||
+ s.date = RUBY_RELEASE_DATE
|
||||
s.email = ["mrkn@mrkn.jp"]
|
||||
|
||||
s.summary = "Arbitrary-precision decimal floating-point number library."
|
||||
diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
|
||||
index 8781093..efdca32 100644
|
||||
--- a/ext/fiddle/fiddle.gemspec
|
||||
+++ b/ext/fiddle/fiddle.gemspec
|
||||
@@ -8,6 +8,7 @@ end
|
||||
Gem::Specification.new do |spec|
|
||||
spec.name = "fiddle"
|
||||
spec.version = version_module::Fiddle::VERSION
|
||||
+ spec.date = RUBY_RELEASE_DATE
|
||||
spec.authors = ["Aaron Patterson", "SHIBATA Hiroshi"]
|
||||
spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
|
||||
|
||||
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
|
||||
index d26a757..cc88c55 100644
|
||||
--- a/ext/io/console/io-console.gemspec
|
||||
+++ b/ext/io/console/io-console.gemspec
|
||||
@@ -4,6 +4,7 @@ _VERSION = "0.6.0"
|
||||
Gem::Specification.new do |s|
|
||||
s.name = "io-console"
|
||||
s.version = _VERSION
|
||||
+ s.date = RUBY_RELEASE_DATE
|
||||
s.summary = "Console interface"
|
||||
s.email = "nobu@ruby-lang.org"
|
||||
s.description = "add console capabilities to IO instances."
|
||||
diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec
|
||||
index 1f4798e..48743cf 100644
|
||||
--- a/lib/ipaddr.gemspec
|
||||
+++ b/lib/ipaddr.gemspec
|
||||
@@ -18,6 +18,7 @@ end
|
||||
Gem::Specification.new do |spec|
|
||||
spec.name = "ipaddr"
|
||||
spec.version = version
|
||||
+ spec.date = RUBY_RELEASE_DATE
|
||||
spec.authors = ["Akinori MUSHA", "Hajimu UMEMOTO"]
|
||||
spec.email = ["knu@idaemons.org", "ume@mahoroba.org"]
|
||||
|
||||
diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
|
||||
index 3c96f7d..fec0872 100644
|
||||
--- a/lib/rdoc/rdoc.gemspec
|
||||
+++ b/lib/rdoc/rdoc.gemspec
|
||||
@@ -7,6 +7,7 @@ end
|
||||
|
||||
Gem::Specification.new do |s|
|
||||
s.name = "rdoc"
|
||||
+ s.date = RUBY_RELEASE_DATE
|
||||
s.version = RDoc::VERSION
|
||||
|
||||
s.authors = [
|
||||
@@ -0,0 +1,35 @@
|
||||
From e74b57febec9bd806e29025e6eeb8091e7021d75 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.
|
||||
|
||||
error in initial header file:
|
||||
| In file included from /tmp/20200124-86625-14hiju4.c:1:
|
||||
| /tmp/20200124-86625-11y6l6i.h:13849:9: error: "__has_include" cannot be used as a macro name
|
||||
| 13849 | #define __has_include __has_include
|
||||
| | ^~~~~~~~~~~~~
|
||||
| compilation terminated due to -Wfatal-errors.
|
||||
|
||||
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 664f750..3b8fbe6 100644
|
||||
--- a/common.mk
|
||||
+++ b/common.mk
|
||||
@@ -238,6 +238,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJE
|
||||
$(ECHO) building $(@F:.time=.h)
|
||||
$(Q)$(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
|
||||
|
||||
$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time
|
||||
@@ -0,0 +1,13 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_fullname=`find test -name test_*.rb`
|
||||
|
||||
for i in ${test_fullname}; do
|
||||
ruby ./test/runner.rb ${i} 2>&1 > /dev/null
|
||||
ret=$?
|
||||
if [ $ret != 0 ]; then
|
||||
echo "FAIL: ${i}"
|
||||
else
|
||||
echo "PASS: ${i}"
|
||||
fi
|
||||
done
|
||||
@@ -0,0 +1,144 @@
|
||||
SUMMARY = "An interpreter of object-oriented scripting language"
|
||||
DESCRIPTION = "Ruby is an interpreted scripting language for quick \
|
||||
and easy object-oriented programming. It has many features to process \
|
||||
text files and to do system management tasks (as in Perl). \
|
||||
It is simple, straight-forward, and extensible. \
|
||||
"
|
||||
HOMEPAGE = "http://www.ruby-lang.org/"
|
||||
SECTION = "devel/ruby"
|
||||
LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \
|
||||
file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \
|
||||
file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://LEGAL;md5=bcd74b47bbaf2051c5e49811a5faa97a \
|
||||
"
|
||||
|
||||
DEPENDS = "zlib openssl libyaml gdbm readline libffi"
|
||||
DEPENDS:append:class-target = " ruby-native"
|
||||
DEPENDS:append:class-nativesdk = " ruby-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://0001-extmk-fix-cross-compilation-of-external-gems.patch \
|
||||
file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \
|
||||
file://remove_has_include_macros.patch \
|
||||
file://run-ptest \
|
||||
file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \
|
||||
file://0002-template-Makefile.in-filter-out-f-prefix-map.patch \
|
||||
file://0003-rdoc-build-reproducible-documentation.patch \
|
||||
file://0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch \
|
||||
file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \
|
||||
file://0006-Make-gemspecs-reproducible.patch \
|
||||
file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \
|
||||
file://0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
|
||||
|
||||
inherit autotools ptest pkgconfig
|
||||
|
||||
|
||||
# This snippet lets compiled extensions which rely on external libraries,
|
||||
# such as zlib, compile properly. If we don't do this, then when extmk.rb
|
||||
# runs, it uses the native libraries instead of the target libraries, and so
|
||||
# none of the linking operations succeed -- which makes extconf.rb think
|
||||
# that the libraries aren't available and hence that the extension can't be
|
||||
# built.
|
||||
|
||||
do_configure:prepend() {
|
||||
sed -i "s#%%TARGET_CFLAGS%%#$CFLAGS#; s#%%TARGET_LDFLAGS%%#$LDFLAGS#" ${S}/common.mk
|
||||
rm -rf ${S}/ruby/
|
||||
}
|
||||
|
||||
DEPENDS:append:libc-musl = " libucontext"
|
||||
|
||||
SRC_URI[sha256sum] = "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
|
||||
|
||||
PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind"
|
||||
PACKAGECONFIG[gmp] = "--with-gmp=yes, --with-gmp=no, gmp"
|
||||
PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
|
||||
# rdoc is off by default due to non-reproducibility reported in
|
||||
# https://bugs.ruby-lang.org/issues/18456
|
||||
PACKAGECONFIG[rdoc] = "--enable-install-rdoc,--disable-install-rdoc,"
|
||||
|
||||
EXTRA_OECONF = "\
|
||||
--disable-versioned-paths \
|
||||
--disable-rpath \
|
||||
--disable-dtrace \
|
||||
--enable-shared \
|
||||
--enable-load-relative \
|
||||
--with-pkg-config=pkg-config \
|
||||
--with-static-linked-ext \
|
||||
"
|
||||
|
||||
EXTRA_OECONF:append:libc-musl = "\
|
||||
ac_cv_func_isnan=yes \
|
||||
ac_cv_func_isinf=yes \
|
||||
"
|
||||
|
||||
PARALLEL_MAKEINST = ""
|
||||
|
||||
do_install:append:class-target () {
|
||||
# Find out rbconfig.rb from .installed.list
|
||||
rbconfig_rb=`grep rbconfig.rb ${B}/.installed.list`
|
||||
# Remove build host directories
|
||||
sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' \
|
||||
-e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \
|
||||
-e 's|${DEBUG_PREFIX_MAP}||g' \
|
||||
-e 's:${HOSTTOOLS_DIR}/::g' \
|
||||
-e 's:${RECIPE_SYSROOT_NATIVE}::g' \
|
||||
-e 's:${RECIPE_SYSROOT}::g' \
|
||||
-e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
|
||||
${D}$rbconfig_rb
|
||||
|
||||
sed -i -e 's|${DEBUG_PREFIX_MAP}||g' \
|
||||
${D}${libdir}/pkgconfig/*.pc
|
||||
|
||||
# logs that may contain host-specific paths
|
||||
find ${D} -name gem_make.out -delete
|
||||
}
|
||||
|
||||
do_install_ptest () {
|
||||
cp -rf ${S}/test ${D}${PTEST_PATH}/
|
||||
|
||||
install -D ${S}/tool/test/runner.rb ${D}${PTEST_PATH}/tool/test/runner.rb
|
||||
cp -r ${S}/tool/lib ${D}${PTEST_PATH}/tool/
|
||||
mkdir -p ${D}${PTEST_PATH}/lib
|
||||
cp -r ${S}/lib/did_you_mean ${S}/lib/rdoc ${D}${PTEST_PATH}/lib
|
||||
|
||||
# install test-binaries
|
||||
# These .so files have sporadic reproducibility fails as seen here:
|
||||
# https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20220107-rm1diuww/packages/diff-html/
|
||||
# As they are needed only in ruby-ptest, and that is currently altogether disabled, let's take them out.
|
||||
# If someone wants to look at where the non-determinism comes from, one possible reason is use of
|
||||
# -rdynamic -Wl,-export-dynamic
|
||||
#find $(find ./.ext -path '*/-test-') -name '*.so' -print0 \
|
||||
# | tar --no-recursion --null -T - --no-same-owner --preserve-permissions -cf - \
|
||||
# | tar -C ${D}${libdir}/ruby/${SHRT_VER}.0/ --no-same-owner --preserve-permissions --strip-components=2 -xf -
|
||||
# adjust path to not assume build directory layout
|
||||
sed -e 's|File.expand_path(.*\.\./bin/erb[^)]*|File.expand_path("${bindir}/erb"|g' \
|
||||
-i ${D}${PTEST_PATH}/test/erb/test_erb_command.rb
|
||||
|
||||
cp -r ${S}/include ${D}/${libdir}/ruby/
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-ri-docs ${PN}-rdoc"
|
||||
|
||||
SUMMARY:${PN}-ri-docs = "ri (Ruby Interactive) documentation for the Ruby standard library"
|
||||
RDEPENDS:${PN}-ri-docs = "${PN}"
|
||||
FILES:${PN}-ri-docs += "${datadir}/ri"
|
||||
|
||||
SUMMARY:${PN}-rdoc = "RDoc documentation generator from Ruby source"
|
||||
RDEPENDS:${PN}-rdoc = "${PN}"
|
||||
FILES:${PN}-rdoc += "${libdir}/ruby/*/rdoc ${bindir}/rdoc"
|
||||
|
||||
FILES:${PN} += "${datadir}/rubygems"
|
||||
|
||||
FILES:${PN}-ptest:append:class-target = "\
|
||||
${libdir}/ruby/include \
|
||||
${libdir}/ruby/${SHRT_VER}.0/*/-test- \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
Reference in New Issue
Block a user