scripts/package in rvm-1.0.11 vs scripts/package in rvm-1.0.13
- old
+ new
@@ -3,12 +3,12 @@
if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
rvm_base_except="selector"
source "$rvm_path/scripts/base"
-install_package() {
-
+install_package()
+{
__rvm_db "${package}_url" "package_url"
if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
(
@@ -91,29 +91,33 @@
result=$?
return ${result:-0}
}
-readline() {
+readline()
+{
package="readline" ; archive_format="tar.gz"
for version in 5.2 6.0 ; do
configure_flags="--disable-dependency-tracking --disable-static --enable-shared"
install_package
done
}
-iconv() {
+iconv()
+{
package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
install_package
}
-curl() {
+curl()
+{
package="curl" ; version=7.19.7 ; archive_format="tar.gz"
install_package
}
-openssl() {
+openssl()
+{
package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
if [[ "Darwin" = "$(uname)" ]] ; then
if [[ ! -z "$rvm_archflags" ]]; then
@@ -157,63 +161,72 @@
fi
configure="$configure_command $openssl_os -I$usr_path/include -L$usr_path/lib --prefix=$usr_path zlib no-asm no-krb5 shared"
install_package
}
-zlib() {
+zlib()
+{
package="zlib" ; version="1.2.5" ; archive_format="tar.gz"
install_package
}
-autoconf() {
+autoconf()
+{
package="autoconf" ; version="2.65" ; archive_format="tar.gz"
prefix_path="$usr_path"
install_package
}
-ncurses() {
+ncurses()
+{
package="ncurses" ; version="5.7" ; archive_format="tar.gz"
configure_flags="--with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs"
install_package
}
-pkgconfig() {
+pkgconfig()
+{
package="pkg-config" ; version="0.23" archive_format="tar.gz"
install_package
}
-gettext() {
+gettext()
+{
package="gettext" ; version="0.17" ; archive_format="tar.gz"
install_package
}
-libxml2() {
+libxml2()
+{
package="libxml2" ; version="2.7.3" ; archive_format="tar.gz"
if [[ "Darwin" = "$(uname)" ]] ; then
configure="./configure --prefix=$usr_path --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
fi
install_package
unset prefix_path
}
-glib() {
+glib()
+{
pkgconfig
gettext
package="glib" ; version="2.23.1" ; archive_format="tar.gz"
configure="CC=\"cc -L$usr_path/lib -I$usr_path/include\" PKG_CONFIG=\"$usr_path/bin/pkg-config\" ./configure --prefix=$usr_path"
install_package
}
-mono() {
+mono()
+{
glib
__rvm_mono_env
package="mono" ; version="2.6.1" ; archive_format="tar.bz2"
install_package
}
-llvm() {
+llvm()
+{
package="llvm" ; version="89156"
if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
(
builtin cd $src_path
if [[ ! -d "$src_path/llvm/.svn" ]] ; then