Commit 47abcaae authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge remote-tracking branch 'origin/gitweb'

Conflicts:
	component/nginx/buildout.cfg
	component/ruby/buildout.cfg
	software/gitrepo/software.cfg
parents e2fd38dc 6979ee61
......@@ -9,3 +9,6 @@ url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
md5sum = ea93970a0275be6b42f56953cd332c17
configure-command = source/configure
configure-options = --prefix=${:location}
[icu]
<= icu4c
......@@ -7,6 +7,10 @@ extends =
../readline/buildout.cfg
../ncurses/buildout.cfg
../libyaml/buildout.cfg
../openssl/buildout.cfg
../ncurses/buildout.cfg
../readline/buildout.cfg
../zlib/buildout.cfg
parts = ruby
......@@ -15,13 +19,15 @@ recipe = slapos.recipe.cmmi
url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
md5sum = bc0c715c69da4d1d8bd57069c19f6c0e
configure-options =
--enable-shared --enable-rpath
--enable-shared --enable-rpath --disable-install-doc
--enable-pthread --enable-ipv6
--with-ext=bigdecimal,continuation,curses,date,digest,dl,etc,fcntl,iconv,io,json,nkf,openssl,pathname,psych,pty,racc,readline,ripper,sdbm,socket,stringio,strscan,syck,syslog,zlib
environment =
CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gdbm:location}/include -I${openssl:location}/include
LDFLAGS=-L${zlib:location}/lib -L${libyaml:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib
PKG_CONFIG_PATH=${libyaml:location}/lib/
[ruby-1.9]
<= ruby-1.9.3
[ruby]
<= ruby-1.9
......@@ -4,10 +4,15 @@ extends =
../../component/apache/buildout.cfg
../../component/perl/buildout.cfg
../../component/git/buildout.cfg
../../component/nginx/buildout.cfg
../../component/ruby/buildout.cfg
../../component/icu/buildout.cfg
../../stack/slapos.cfg
parts =
apache
nginx
ruby
perl
git
gitweb
......@@ -15,6 +20,8 @@ parts =
template
template-gitrepo
collective-recipe-cmd
ruby-gems
python-eggs
[template]
recipe = slapos.recipe.template
......@@ -60,6 +67,24 @@ recipe = zc.recipe.egg
eggs =
collective.recipe.cmd
[ruby-gems]
recipe = rubygemsrecipe
ruby-executable = ${ruby:location}/bin/ruby
gems =
charlock_holmes==0.6.8
bundler
rake
rails
railties
gem-options = --with-icu-lib=${icu:location}/lib/ --with-icu-dir=${icu:location}/
environment =
LDFLAGS = -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib
CFLAGS = -I${icu:location}/include
[python-eggs]
recipe = zc.recipe.egg
eggs =
pygments
[version]
slapos.cookbook = 0.64.2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment