Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

invoke make update-gems before make install with ruby-trunk #1098

Merged
merged 6 commits into from
Jun 13, 2017
Merged

invoke make update-gems before make install with ruby-trunk #1098

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15e4c79
invoke make update-gems before make install with ruby-trunk
hsbt Jun 9, 2017
eb61f1d
invoke extract-gems after update-gems
hsbt Jun 12, 2017
4d0c3d5
Separated standard function to standard_build and standard_install.
hsbt Jun 12, 2017
6d94ce9
To use standard_build and standard_install_with_bundled_gems for ruby…
hsbt Jun 12, 2017
330e3fc
Pass arguments for separated functions
hsbt Jun 12, 2017
f7c96a7
Merge branch 'master' into update-gems
hsbt Jun 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions bin/ruby-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ build_package_warn_unsupported() {
} >&3
}

build_package_standard() {
build_package_standard_build() {
local package_name="$1"

if [ "${MAKEOPTS+defined}" ]; then
Expand All @@ -548,8 +548,6 @@ build_package_standard() {
local PACKAGE_CONFIGURE_OPTS_ARRAY="${package_var_name}_CONFIGURE_OPTS_ARRAY[@]"
local PACKAGE_MAKE_OPTS="${package_var_name}_MAKE_OPTS"
local PACKAGE_MAKE_OPTS_ARRAY="${package_var_name}_MAKE_OPTS_ARRAY[@]"
local PACKAGE_MAKE_INSTALL_OPTS="${package_var_name}_MAKE_INSTALL_OPTS"
local PACKAGE_MAKE_INSTALL_OPTS_ARRAY="${package_var_name}_MAKE_INSTALL_OPTS_ARRAY[@]"
local PACKAGE_CFLAGS="${package_var_name}_CFLAGS"

if [ "$package_var_name" = "RUBY" ]; then
Expand All @@ -567,10 +565,34 @@ build_package_standard() {
) >&4 2>&1

{ "$MAKE" $MAKE_OPTS ${!PACKAGE_MAKE_OPTS} "${!PACKAGE_MAKE_OPTS_ARRAY}"
"$MAKE" install $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"
} >&4 2>&1
}

build_package_standard_install() {
local package_name="$1"
local package_var_name="$(capitalize "${package_name%%-*}")"

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}"
} >&4 2>&1
}

build_package_standard_install_with_bundled_gems() {
{ "$MAKE" update-gems
"$MAKE" extract-gems
} >&4 2>&1

build_package_standard_install "$@"
}

# Backword Compatibility for standard function
build_package_standard() {
build_package_standard_build "$@"
build_package_standard_install "$@"
}

build_package_autoconf() {
{ autoconf
} >&4 2>&1
Expand Down
2 changes: 1 addition & 1 deletion share/ruby-build/2.2.0-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
install_package "openssl-1.0.2l" "https://www.openssl.org/source/openssl-1.0.2l.tar.gz#ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c" mac_openssl --if has_broken_mac_openssl
install_git "ruby-2.2.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_2" ldflags_dirs autoconf standard verify_openssl
install_git "ruby-2.2.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_2" ldflags_dirs autoconf standard_build standard_install_with_bundled_gems verify_openssl
2 changes: 1 addition & 1 deletion share/ruby-build/2.3.0-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
install_package "openssl-1.0.2l" "https://www.openssl.org/source/openssl-1.0.2l.tar.gz#ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c" mac_openssl --if has_broken_mac_openssl
install_git "ruby-2.3.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_3" ldflags_dirs autoconf standard verify_openssl
install_git "ruby-2.3.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_3" ldflags_dirs autoconf standard_build standard_install_with_bundled_gems verify_openssl
4 changes: 2 additions & 2 deletions share/ruby-build/2.4.0-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
install_package "openssl-1.1.0f" "https://www.openssl.org/source/openssl-1.1.0f.tar.gz#12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765" mac_openssl --if has_broken_mac_openssl
install_git "ruby-2.4.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_4" ldflags_dirs autoconf standard verify_openssl
install_package "openssl-1.1.0f" "https://www.openssl.org/source/openssl-1.1.0f.tar.gz#12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765" mac_openssl --if has_broken_mac_openssl
install_git "ruby-2.4.0-dev" "https://github.com/ruby/ruby.git" "ruby_2_4" ldflags_dirs autoconf standard_build standard_install_with_bundled_gems verify_openssl
4 changes: 2 additions & 2 deletions share/ruby-build/2.5.0-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
install_package "openssl-1.1.0f" "https://www.openssl.org/source/openssl-1.1.0f.tar.gz#12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765" mac_openssl --if has_broken_mac_openssl
install_git "ruby-trunk" "https://github.com/ruby/ruby.git" "trunk" ldflags_dirs autoconf standard verify_openssl
install_package "openssl-1.1.0f" "https://www.openssl.org/source/openssl-1.1.0f.tar.gz#12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765" mac_openssl --if has_broken_mac_openssl
install_git "ruby-trunk" "https://github.com/ruby/ruby.git" "trunk" ldflags_dirs autoconf standard_build standard_install_with_bundled_gems verify_openssl