mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 02:37:35 +00:00
Ports: Update mruby's patches to use git patches
This commit is contained in:
parent
37857a629d
commit
a2402faaf3
4 changed files with 54 additions and 12 deletions
24
Ports/mruby/patches/0001-Include-sys-select.h.patch
Normal file
24
Ports/mruby/patches/0001-Include-sys-select.h.patch
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
From 2570626cb58a59e45251dffa409547919dc23df2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dante Catalfamo <dante.catalfamo@gmail.com>
|
||||||
|
Date: Fri, 20 Aug 2021 00:38:31 -0400
|
||||||
|
Subject: [PATCH 1/2] Include sys/select.h
|
||||||
|
|
||||||
|
---
|
||||||
|
mrbgems/mruby-io/src/io.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
|
||||||
|
index 0469c05..0dae6ca 100644
|
||||||
|
--- a/mrbgems/mruby-io/src/io.c
|
||||||
|
+++ b/mrbgems/mruby-io/src/io.c
|
||||||
|
@@ -49,6 +49,7 @@
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
+ #include <sys/select.h>
|
||||||
|
typedef size_t fsize_t;
|
||||||
|
typedef time_t ftime_t;
|
||||||
|
typedef suseconds_t fsuseconds_t;
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
|
@ -1,5 +1,18 @@
|
||||||
--- /dev/null 2021-08-20 13:32:02.136545596 -0400
|
From 0b19221cc06f6fda8120d1f1bde79ce0a43db8d5 Mon Sep 17 00:00:00 2001
|
||||||
+++ mruby-3.0.0/build_config/serenity.rb 2021-08-20 14:18:09.673875364 -0400
|
From: Dante Catalfamo <dante.catalfamo@gmail.com>
|
||||||
|
Date: Fri, 20 Aug 2021 00:38:31 -0400
|
||||||
|
Subject: [PATCH 2/2] Add a build conf for serenity
|
||||||
|
|
||||||
|
---
|
||||||
|
build_config/serenity.rb | 16 ++++++++++++++++
|
||||||
|
1 file changed, 16 insertions(+)
|
||||||
|
create mode 100644 build_config/serenity.rb
|
||||||
|
|
||||||
|
diff --git a/build_config/serenity.rb b/build_config/serenity.rb
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..b38f5ee
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/build_config/serenity.rb
|
||||||
@@ -0,0 +1,16 @@
|
@@ -0,0 +1,16 @@
|
||||||
+MRuby::CrossBuild.new('serenity') do |conf|
|
+MRuby::CrossBuild.new('serenity') do |conf|
|
||||||
+ conf.toolchain :gcc
|
+ conf.toolchain :gcc
|
||||||
|
@ -17,3 +30,6 @@
|
||||||
+
|
+
|
||||||
+ conf.test_runner.command = 'env'
|
+ conf.test_runner.command = 'env'
|
||||||
+end
|
+end
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
12
Ports/mruby/patches/ReadMe.md
Normal file
12
Ports/mruby/patches/ReadMe.md
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
# Patches for mruby on SerenityOS
|
||||||
|
|
||||||
|
## `0001-Include-sys-select.h.patch`
|
||||||
|
|
||||||
|
Include sys/select.h
|
||||||
|
|
||||||
|
|
||||||
|
## `0002-Add-a-build-conf-for-serenity.patch`
|
||||||
|
|
||||||
|
Add a build conf for serenity
|
||||||
|
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
--- mruby-3.0.0/mrbgems/mruby-io/src/io.c 2021-08-20 00:27:04.837317416 -0400
|
|
||||||
+++ mruby-3.0.0.serenity/mrbgems/mruby-io/src/io.c 2021-08-20 00:28:51.960390750 -0400
|
|
||||||
@@ -49,6 +49,7 @@
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
+ #include <sys/select.h>
|
|
||||||
typedef size_t fsize_t;
|
|
||||||
typedef time_t ftime_t;
|
|
||||||
typedef suseconds_t fsuseconds_t;
|
|
Loading…
Add table
Add a link
Reference in a new issue