From 62da1799308697f44248aa40d2950004b6f29de7 Mon Sep 17 00:00:00 2001 From: Bleicke and Matthew Boedicker Date: Thu, 14 Feb 2013 10:40:13 -0800 Subject: [PATCH] [fixes #44347205] Install libyaml to prevent verbose warnings and possibly breakage in psych / yaml gems --- config/blobs.yml | 4 ++++ packages/libyaml/packaging | 8 ++++++++ packages/libyaml/spec | 4 ++++ packages/ruby_next/packaging | 3 +-- packages/ruby_next/spec | 8 +++++--- 5 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 packages/libyaml/packaging create mode 100644 packages/libyaml/spec diff --git a/config/blobs.yml b/config/blobs.yml index 21d77196d1..59a556f8c9 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -691,3 +691,7 @@ mysql/client-5.5.29-rel29.4-401.Linux.x86_64.tar.gz: object_id: eyJvaWQiOiI0ZTRlNzhiY2E0MWUxMjEwMDRlNGU3ZDUxNzYxOGYwNTEwYjIx%0AZDI4YTJiYiIsInNpZyI6InJocVhmTUFMZEpTbHNERG5OTWczZVJOenlCWT0i%0AfQ==%0A sha: 8dad5b2d9fee7b0a98e419949c6f7d94c39443f2 size: 4564276 +libyaml/yaml-0.1.4.tgz: + object_id: eyJvaWQiOiI0ZTRlNzhiY2E1MWUxMjIwMDRlNGU4ZWM2ODQwNzcwNTExZDM1%0AZmZjOTFiZCIsInNpZyI6IlIwQk51U2ZSTVQ1czgzVHpPQkZBVVFxYjJWaz0i%0AfQ==%0A + sha: e0e5e09192ab10a607e3da2970db492118f560f2 + size: 471759 diff --git a/packages/libyaml/packaging b/packages/libyaml/packaging new file mode 100644 index 0000000000..351f67823d --- /dev/null +++ b/packages/libyaml/packaging @@ -0,0 +1,8 @@ +# abort script on any command that exit with a non zero value +set -e + +tar xzf libyaml/yaml-0.1.4.tgz +cd yaml-0.1.4 +./configure --prefix=${BOSH_INSTALL_TARGET} +make +make install diff --git a/packages/libyaml/spec b/packages/libyaml/spec new file mode 100644 index 0000000000..eb090b0399 --- /dev/null +++ b/packages/libyaml/spec @@ -0,0 +1,4 @@ +--- +name: libyaml +files: + - libyaml/yaml-0.1.4.tgz diff --git a/packages/ruby_next/packaging b/packages/ruby_next/packaging index b04bee50a7..72b0e86948 100644 --- a/packages/ruby_next/packaging +++ b/packages/ruby_next/packaging @@ -4,13 +4,12 @@ set -e tar xzf ruby/ruby-1.9.3-p194.tar.gz ( cd ruby-1.9.3-p194 - ./configure --prefix=${BOSH_INSTALL_TARGET} --disable-install-doc + ./configure --prefix=${BOSH_INSTALL_TARGET} --disable-install-doc --with-opt-dir=/var/vcap/packages/libyaml make make install ) tar zxvf ruby/rubygems-1.8.24.tgz - ( cd rubygems-1.8.24 diff --git a/packages/ruby_next/spec b/packages/ruby_next/spec index 0b54331a8b..e2bbdeda5d 100644 --- a/packages/ruby_next/spec +++ b/packages/ruby_next/spec @@ -1,6 +1,8 @@ --- name: ruby_next +dependency: + - libyaml files: -- ruby/ruby-1.9.3-p194.tar.gz -- ruby/rubygems-1.8.24.tgz -- ruby/bundler-1.2.1.gem + - ruby/ruby-1.9.3-p194.tar.gz + - ruby/rubygems-1.8.24.tgz + - ruby/bundler-1.2.1.gem