Skip to content

Commit a2402fa

Browse files
committed
Ports: Update mruby's patches to use git patches
1 parent 37857a6 commit a2402fa

File tree

4 files changed

+54
-12
lines changed

4 files changed

+54
-12
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 2570626cb58a59e45251dffa409547919dc23df2 Mon Sep 17 00:00:00 2001
2+
From: Dante Catalfamo <dante.catalfamo@gmail.com>
3+
Date: Fri, 20 Aug 2021 00:38:31 -0400
4+
Subject: [PATCH 1/2] Include sys/select.h
5+
6+
---
7+
mrbgems/mruby-io/src/io.c | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
11+
index 0469c05..0dae6ca 100644
12+
--- a/mrbgems/mruby-io/src/io.c
13+
+++ b/mrbgems/mruby-io/src/io.c
14+
@@ -49,6 +49,7 @@
15+
#include <sys/wait.h>
16+
#include <sys/time.h>
17+
#include <unistd.h>
18+
+ #include <sys/select.h>
19+
typedef size_t fsize_t;
20+
typedef time_t ftime_t;
21+
typedef suseconds_t fsuseconds_t;
22+
--
23+
2.36.1
24+

Ports/mruby/patches/serenity-build-conf.patch renamed to Ports/mruby/patches/0002-Add-a-build-conf-for-serenity.patch

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
1-
--- /dev/null 2021-08-20 13:32:02.136545596 -0400
2-
+++ mruby-3.0.0/build_config/serenity.rb 2021-08-20 14:18:09.673875364 -0400
1+
From 0b19221cc06f6fda8120d1f1bde79ce0a43db8d5 Mon Sep 17 00:00:00 2001
2+
From: Dante Catalfamo <dante.catalfamo@gmail.com>
3+
Date: Fri, 20 Aug 2021 00:38:31 -0400
4+
Subject: [PATCH 2/2] Add a build conf for serenity
5+
6+
---
7+
build_config/serenity.rb | 16 ++++++++++++++++
8+
1 file changed, 16 insertions(+)
9+
create mode 100644 build_config/serenity.rb
10+
11+
diff --git a/build_config/serenity.rb b/build_config/serenity.rb
12+
new file mode 100644
13+
index 0000000..b38f5ee
14+
--- /dev/null
15+
+++ b/build_config/serenity.rb
316
@@ -0,0 +1,16 @@
417
+MRuby::CrossBuild.new('serenity') do |conf|
518
+ conf.toolchain :gcc
@@ -17,3 +30,6 @@
1730
+
1831
+ conf.test_runner.command = 'env'
1932
+end
33+
--
34+
2.36.1
35+

Ports/mruby/patches/ReadMe.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Patches for mruby on SerenityOS
2+
3+
## `0001-Include-sys-select.h.patch`
4+
5+
Include sys/select.h
6+
7+
8+
## `0002-Add-a-build-conf-for-serenity.patch`
9+
10+
Add a build conf for serenity
11+
12+

Ports/mruby/patches/include-sys-select-h.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)