Commit 3a4d3fb0 authored by Jean Boussier's avatar Jean Boussier Committed by Benoit Daloze
Browse files

Join *_OPTS variables after *_OPTS_ARRAY variables 

This for instance allows `RUBY_CONFIGURE_OPTS` to override
what's set by the definition.

For instance `enable_shared` can be disabled with `RUBY_CONFIGURE_OPTS='--disable-shared'`
parent 0bd64d37

bin/ruby-build

+6 −6
Original line number Diff line number Diff line
@@ -589,10 +589,10 @@ build_package_standard_build() { 
      export CC=clang

    fi

    ${!PACKAGE_CONFIGURE:-./configure} --prefix="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}" \

      $CONFIGURE_OPTS ${!PACKAGE_CONFIGURE_OPTS} "${!PACKAGE_CONFIGURE_OPTS_ARRAY}" || return 1

      "${!PACKAGE_CONFIGURE_OPTS_ARRAY}" $CONFIGURE_OPTS ${!PACKAGE_CONFIGURE_OPTS} || return 1

  ) >&4 2>&1



  { "$MAKE" $MAKE_OPTS ${!PACKAGE_MAKE_OPTS} "${!PACKAGE_MAKE_OPTS_ARRAY}"

  { "$MAKE" "${!PACKAGE_MAKE_OPTS_ARRAY}" $MAKE_OPTS ${!PACKAGE_MAKE_OPTS} 

  } >&4 2>&1

}
@@ -603,7 +603,7 @@ build_package_standard_install() { 
  local PACKAGE_MAKE_INSTALL_OPTS="${package_var_name}_MAKE_INSTALL_OPTS"

  local PACKAGE_MAKE_INSTALL_OPTS_ARRAY="${package_var_name}_MAKE_INSTALL_OPTS_ARRAY[@]"



  { "$MAKE" install $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"

  { "$MAKE" install "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}" $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS}

  } >&4 2>&1

}
@@ -640,7 +640,7 @@ build_package_ree_installer() { 
  is_mac && options="--no-tcmalloc"



  local option

  for option in $RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[@]}; do

  for option in ${RUBY_CONFIGURE_OPTS_ARRAY[@]} $RUBY_CONFIGURE_OPTS; do

    options="$options -c $option"

  done
@@ -672,7 +672,7 @@ build_package_rbx() { 
      fi

    done



    RUBYOPT="-rrubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS "${configure_opts[@]}"

    RUBYOPT="-rrubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" "${configure_opts[@]}" $RUBY_CONFIGURE_OPTS

    rake install

    fix_rbx_gem_binstubs "$PREFIX_PATH"

    fix_rbx_irb "$PREFIX_PATH"