Permalink
Browse files

improve the installation process

  • Loading branch information...
1 parent a973f43 commit 60997e145fcc8dcba7a2c55b6663bc8c86290c6a @mpapis mpapis committed Apr 30, 2012
Showing with 22 additions and 4 deletions.
  1. +2 −0 config/checksum
  2. +1 −2 config/defaults
  3. +18 −1 shell/functions
  4. +1 −1 shell/includes
View
@@ -0,0 +1,2 @@
+ruby-1.9.3-p125.tar.gz=md5,e3ea86b9d3fc2d3ec867f66969ae3b92
+ruby-1.9.3-p194.tar.gz=md5,bc0c715c69da4d1d8bd57069c19f6c0e
View
@@ -1,5 +1,4 @@
-version=1.9.3-p125
+version=1.9.3-p194
package_extension=tar.bz2
base_url=http://ftp.ruby-lang.org/pub/ruby/1.9/
configure_flags=--enable-load-relative --with-static-linked-ext --disable-shared
-
View
@@ -20,7 +20,13 @@ tokaidoapp_install_dependencies()
tokaido_install_package libyaml
tokaido_install_package zlib
- tokaido_install_package openssl version 0.9.8t
+ if os is darwin
+ then
+ # TODO: why limit openssl on osx ?
+ tokaido_install_package openssl version 0.9.8t
+ else
+ tokaido_install_package openssl
+ fi
}
tokaidoapp_prefetch()
@@ -29,3 +35,14 @@ tokaidoapp_prefetch()
file "ruby-${package_version}.${archive_format}" \
dir "ruby-${package_version}"
}
+
+tokaidoapp_preconfigure()
+{
+ # only on osx, on linux it causes glibc conflicts
+ if os is darwin
+ then
+ LDFLAGS="-Bstatic $LDFLAGS"
+ else
+ LDFLAGS="-static $LDFLAGS"
+ fi
+}
View
@@ -1,3 +1,3 @@
api/package
+api/os
cli/sets
-

0 comments on commit 60997e1

Please sign in to comment.