scripts/package in rvm-0.1.38 vs scripts/package in rvm-0.1.39
- old
+ new
@@ -84,17 +84,24 @@
package_url="http://curl.haxx.se/download"
install_package
}
openssl() {
- if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
- export openssl_os="os/compiler darwin64-x86_64-cc"
- else
- export openssl_os="os/compiler darwin-i386-cc"
- fi
package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
package_url="http://www.openssl.org/source"
- configure="./config --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
+ if [[ "Darwin" = "$(uname)" ]] ; then
+ if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
+ export openssl_os="os/compiler darwin64-x86_64-cc"
+ else
+ export openssl_os="os/compiler darwin-i386-cc"
+ fi
+ configure_command="./Configure"
+ patches="$rvm_patches_path/$package/Makefile.org.patch,$rvm_patches_path/$package/crypto-Makefile.patch"
+
+ else
+ configure_command="./config"
+ fi
+ configure="$configure_command $openssl_os -I$rvm_usr_path/include -L$rvm_usr_path/lib --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
install_package
}
zlib() {
package="zlib" ; version="1.2.5" ; archive_format="tar.gz"