Skip to content

Commit

Permalink
Cannot build rbx-2.5.2 on ArchLinux (#3858)
Browse files Browse the repository at this point in the history
Fixes #3497. Uses #3851
  • Loading branch information
pkuczynski committed Jan 4, 2017
1 parent 98b1c38 commit 819cc8f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* RVM incorrectly tries to install llvm 3.5 when trying to install Rubinius 3 [\#3848](https://github.com/rvm/rvm/pull/3848)
* Failing openssl.patch for Ruby 1.9.3 [\#3831](https://github.com/rvm/rvm/issues/3831)
* RVM hardcodes number of compile threads [\#3856](https://github.com/rvm/rvm/pull/3856)
* Cannot build rbx-2.5.2 on ArchLinux [\#3497](https://github.com/rvm/rvm/issues/3497)

## [1.28.0](https://github.com/rvm/rvm/tag/1.28.0)

Expand Down
12 changes: 12 additions & 0 deletions scripts/functions/requirements/arch
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ requirements_arch_libs_install()
__rvm_try_sudo pacman -Sy --needed --noconfirm "$@" || return $?
}

requirements_arch_libs_remove()
{
__rvm_try_sudo pacman -Rs --noconfirm "$@" || return $?
}

requirements_arch_update_system()
{
# Has to be ran separately so new version can be used for installing missing libs
Expand Down Expand Up @@ -64,12 +69,19 @@ requirements_arch_define()
requirements_check nodejs
;;
(rbx*head|rubinius*head)
undesired_check clang35 llvm35 llvm35-libs
requirements_check clang llvm llvm-libs patch curl zlib readline autoconf automake diffutils make libtool bison git
;;
(rbx-3*|rubinius-3*)
undesired_check clang35 llvm35 llvm35-libs
requirements_check clang llvm llvm-libs patch curl zlib readline autoconf automake diffutils make libtool bison
;;
(rbx-2*|rubinius-2*)
undesired_check clang llvm llvm-libs
requirements_check clang35 llvm35 llvm35-libs patch curl zlib readline autoconf automake diffutils make libtool bison
;;
(rbx-1*|rubinius-1*)
undesired_check clang llvm llvm-libs
requirements_check clang35 llvm35 llvm35-libs patch curl zlib readline autoconf automake diffutils make libtool bison
;;
(*-head)
Expand Down

0 comments on commit 819cc8f

Please sign in to comment.