Unverified Commit feb5253b authored by Hiroshi SHIBATA's avatar Hiroshi SHIBATA Committed by GitHub
Browse files

Merge pull request #2044 from casperisfine/homebrew-gmp 

macOS: Use GMP from homebrew
parents ef66bd1f 1f9b7921

bin/ruby-build

+11 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ build_package_standard_build() { 


  if [ "$package_var_name" = "RUBY" ]; then

      use_homebrew_readline || use_freebsd_pkg ||true

      use_homebrew_gmp || true

  fi



  ( if [ "${CFLAGS+defined}" ] || [ "${!PACKAGE_CFLAGS+defined}" ]; then
@@ -1047,6 +1048,16 @@ use_homebrew_yaml() { 
  fi

}



use_homebrew_gmp() {

  local libdir="$(brew --prefix gmp 2>/dev/null || true)"

  if [ -d "$libdir" ]; then

    echo "ruby-build: using gmp from homebrew"

    package_option ruby configure --with-gmp-dir="$libdir"

  else

    return 1

  fi

}



use_freebsd_pkg() {

  # check if FreeBSD

  if [ "FreeBSD" = "$(uname -s)" ]; then

script/test

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash

set -e



bats ${CI:+--tap} test
 
bats ${CI:+--tap} test "$@"

test/build.bats

+27 −3
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ OUT 
  mkdir -p "$brew_libdir"



  stub uname '-s : echo Linux'

  stub brew "--prefix libyaml : echo '$brew_libdir'" false

  stub brew "--prefix libyaml : echo '$brew_libdir'" false false

  stub_make_install



  install_fixture definitions/needs-yaml
@@ -203,13 +203,37 @@ make install 
OUT

}



@test "gmp is linked from Homebrew" {

  cached_tarball "ruby-2.0.0"



  gmp_libdir="$TMP/homebrew-gmp"

  mkdir -p "$gmp_libdir"



  stub brew false "--prefix gmp : echo '$gmp_libdir'"

  stub_make_install



  run_inline_definition <<DEF

install_package "ruby-2.0.0" "http://ruby-lang.org/ruby/2.0/ruby-2.0.0.tar.gz"

DEF

  assert_success



  unstub brew

  unstub make



  assert_build_log <<OUT

ruby-2.0.0: --prefix=$INSTALL_ROOT --with-gmp-dir=$gmp_libdir

make -j 2

make install

OUT

}



@test "readline is linked from Homebrew" {

  cached_tarball "ruby-2.0.0"



  readline_libdir="$TMP/homebrew-readline"

  mkdir -p "$readline_libdir"



  stub brew "--prefix readline : echo '$readline_libdir'"

  stub brew "--prefix readline : echo '$readline_libdir'" false

  stub_make_install



  run_inline_definition <<DEF
@@ -230,7 +254,7 @@ OUT 
@test "readline is not linked from Homebrew when explicitly defined" {

  cached_tarball "ruby-2.0.0"



  stub brew

  stub brew false

  stub_make_install



  export RUBY_CONFIGURE_OPTS='--with-readline-dir=/custom'