From ebd0597df484ccacd7569ddebcf06fb2888be22c Mon Sep 17 00:00:00 2001 From: Dmitry Gritsay Date: Wed, 29 Nov 2017 17:36:50 +0200 Subject: [PATCH 1/2] Enable installing static library for MRI 2.4 and 2.5 - Install both static and dynamic libraries for MRI 2.4 and 2.5 --- build.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 5e09ac991..9f9b5a941 100755 --- a/build.sh +++ b/build.sh @@ -200,7 +200,14 @@ ruby-*) if [[ $RUBY = *head* ]]; then EXTRA_FLAGS="--rubygems ignore" fi - announce rvm install $RUBY $EXTRA_FLAGS --verify-downloads 1 $MOVABLE_FLAG --disable-install-doc -C --without-tcl,--without-tk,--without-gmp;; + + CONFIGURE_OPTS=( --without-tcl --without-tk --without-gmp ) + case $RUBY in + ruby-2.4*|ruby-2.5*) + CONFIGURE_OPTS+=( --enable-install-static-library );; + esac + + announce rvm install $RUBY $EXTRA_FLAGS --verify-downloads 1 $MOVABLE_FLAG --disable-install-doc -- ${CONFIGURE_OPTS[@]};; jruby-head) update_mvn 3.3.9 announce rvm install $RUBY --verify-downloads 1;; @@ -268,4 +275,3 @@ else echo "This is a Pull Request, skipping." fi fold_end check.3 - From b2b6922865788d6c07dda43d9e6f344c85f84f6b Mon Sep 17 00:00:00 2001 From: Dmitry Gritsay Date: Tue, 12 Dec 2017 15:05:56 +0200 Subject: [PATCH 2/2] Remove extra newlines --- build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.sh b/build.sh index 9f9b5a941..ca3d310d0 100755 --- a/build.sh +++ b/build.sh @@ -200,13 +200,11 @@ ruby-*) if [[ $RUBY = *head* ]]; then EXTRA_FLAGS="--rubygems ignore" fi - CONFIGURE_OPTS=( --without-tcl --without-tk --without-gmp ) case $RUBY in ruby-2.4*|ruby-2.5*) CONFIGURE_OPTS+=( --enable-install-static-library );; esac - announce rvm install $RUBY $EXTRA_FLAGS --verify-downloads 1 $MOVABLE_FLAG --disable-install-doc -- ${CONFIGURE_OPTS[@]};; jruby-head) update_mvn 3.3.9