Remove uneeded patch
authorSam <sam.saffron@gmail.com>
Thu, 7 Dec 2017 00:10:35 +0000 (11:10 +1100)
committerSam <sam.saffron@gmail.com>
Thu, 7 Dec 2017 00:10:35 +0000 (11:10 +1100)
image/base/Dockerfile
image/base/rb_thread_fd_close.patch [deleted file]

index 96873c09dc822f084e69cce33415aa35c9604bb0..a170b4012c2a6b8fb3bfb16aa859ecba1e745220 100644 (file)
@@ -72,11 +72,10 @@ RUN mkdir /lockless && cd /lockless && curl -O https://locklessinc.com/downloads
       tar zxf lockless_allocator_linux.tgz && mv lockless_allocator_linux/64bit/libllalloc.so.1.4 /usr/lib &&\
       cd / && rm -rf /lockless
 
-ADD rb_thread_fd_close.patch /tmp/rb_thread_fd_close.patch
 RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
     mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
     cd /src/ruby-build && ./install.sh &&\
-    cd / && rm -rf /src/ruby-build && (ruby-build 2.4.2 /usr/local --patch << /tmp/rb_thread_fd_close.patch)
+    cd / && rm -rf /src/ruby-build && (ruby-build 2.4.2 /usr/local)
 
 RUN gem update --system
 
diff --git a/image/base/rb_thread_fd_close.patch b/image/base/rb_thread_fd_close.patch
deleted file mode 100644 (file)
index 07c2563..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- branches/ruby_2_3/thread.c 2017/04/09 11:53:53     58288
-+++ branches/ruby_2_3/thread.c 2017/04/09 13:26:01     58289
-@@ -2187,6 +2187,12 @@
-     return busy;
- }
-+void
-+rb_thread_fd_close(int fd)
-+{
-+    while (rb_notify_fd_close(fd));
-+}
-+
- /*
-  *  call-seq:
-  *     thr.raise