diff options
| author |  Alexander Polcyn <apolcyn@google.com> | 2017-01-09 17:34:36 -0800 |
|---|---|---|
| committer |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-01-30 19:27:39 +0100 |
| commit | a1fa5a3381d2d28e82261cb1efb634696debd501 (patch) | |
| tree | 514f6260d37572a1d45f1de432772d2dd0fc4c53 /third_party/rake-compiler-dock | |
| parent | b230ba870e979699d21f5496990fe76bbc23bb1c (diff) | |
fix missing static ruby lib on 2.4.0
Diffstat (limited to 'third_party/rake-compiler-dock')
| -rw-r--r-- | third_party/rake-compiler-dock/Dockerfile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/third_party/rake-compiler-dock/Dockerfile b/third_party/rake-compiler-dock/Dockerfile index 2cc4d410df..115cb1c382 100644 --- a/third_party/rake-compiler-dock/Dockerfile +++ b/third_party/rake-compiler-dock/Dockerfile @@ -122,13 +122,16 @@ RUN echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \ rvm 2.4.0 do gem install mini_portile2 && \ find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw " +RUN bash -c "gem env" +RUN bash -c "gem list rake-compiler" + # Install rake-compiler's cross rubies in global dir instead of /root RUN sudo mkdir -p /usr/local/rake-compiler && \ sudo chown rvm.rvm /usr/local/rake-compiler && \ ln -s /usr/local/rake-compiler ~/.rake-compiler # Patch rake-compiler to avoid build of ruby extensions -RUN cd /usr/local/rvm/gems/ruby-2.4.0/gems/rake-compiler-0.9.5 && git apply /home/rvm/patches/rake-compiler-0.9.5/*.diff ; \ +RUN cd /usr/local/rvm/gems/ruby-2.4.0/gems/rake-compiler-1.0.3 && git apply /home/rvm/patches/rake-compiler-1.0.3/*.diff ; \ true RUN bash -c "rvm use 2.4.0 --default && \ @@ -204,6 +207,10 @@ RUN cp /tmp/build/runas /usr/local/bin/ # Install sudoers configuration RUN cp /tmp/build/sudoers /etc/sudoers.d/rake-compiler-dock +# Fixup Ruby 2.4 'static' compilation issue. +RUN echo '!<arch>' > /usr/local/rake-compiler/ruby/x86_64-linux-gnu/ruby-2.4.0/lib/libruby.a +RUN echo '!<arch>' > /usr/local/rake-compiler/ruby/i686-linux-gnu/ruby-2.4.0/lib/libruby.a + ENV RUBY_CC_VERSION 2.4.0:2.3.0:2.2.2:2.1.5:2.0.0 CMD bash |