Skip to content

Commit 12f12d9

Browse files
committed
Apply patch from ruby/ruby#12995 in libretro builds
1 parent de5216c commit 12f12d9

File tree

2 files changed

+6
-173
lines changed

2 files changed

+6
-173
lines changed

libretro/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,16 @@ $(DOWNLOADS)/crossruby/configure: $(DOWNLOADS)/crossruby/configure.ac $(RUBY)
135135
cd $(DOWNLOADS)/crossruby && $(RUBY) tool/downloader.rb -d tool -e gnu config.guess config.sub
136136
cd $(DOWNLOADS)/crossruby && $(AUTORECONF) -i
137137

138-
$(DOWNLOADS)/crossruby/configure.ac:
138+
$(DOWNLOADS)/crossruby/configure.ac: $(DOWNLOADS)/ruby-12995.patch
139139
mkdir -p $(DOWNLOADS)
140140
$(CLONE) $(GITHUB)/ruby/ruby $(DOWNLOADS)/crossruby -b $(RUBY_VERSION)
141-
cd $(DOWNLOADS)/crossruby && $(GIT) apply ${PWD}/ruby-setjmp.patch
141+
cd $(DOWNLOADS)/crossruby && $(GIT) apply $(DOWNLOADS)/ruby-12995.patch
142142
echo '#include "${PWD}/ruby-bindings.h"' >> $(DOWNLOADS)/crossruby/gc.c
143143

144+
$(DOWNLOADS)/ruby-12995.patch:
145+
mkdir -p $(DOWNLOADS)
146+
$(CURL) -Lo $(DOWNLOADS)/ruby-12995.patch $(GITHUB)/ruby/ruby/pull/12995.diff
147+
144148
# Base Ruby (targets the build machine)
145149

146150
$(RUBY): $(DOWNLOADS)/baseruby/Makefile

libretro/ruby-setjmp.patch

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

0 commit comments

Comments
 (0)