Commit f006bf45 authored by Kirill Smelkov's avatar Kirill Smelkov

Merge remote-tracking branch 'webr8566/master'

* webr8566/master:
  old work-in-progress on building gitlab
  .
parents a65629fd ef0b3736
[buildout]
extends =
/home/kirr/src/wendelin/slapos/slapos/stack/slapos.cfg
/home/kirr/src/wendelin/slapos/slapos/component/ruby/buildout.cfg
/home/kirr/src/wendelin/slapos/slapos/component/postgresql/buildout.cfg
slapos/stack/slapos.cfg
slapos/component/ruby/buildout.cfg
slapos/component/postgresql/buildout.cfg
slapos/component/cmake/buildout.cfg
slapos/component/icu/buildout.cfg
slapos/component/pkgconfig/buildout.cfg
# NOTE kerberos can be --without'ed in 7.11
slapos/component/kerberos/buildout.cfg
parts =
......@@ -11,6 +17,10 @@ parts =
# ruby
git
postgresql
cmake
icu
kerberos
pkgconfig
ktestbin
......@@ -63,9 +73,9 @@ bundle = ${buildout:bin-directory}/bundle
# ( reason: rubygemsrecipe hardcodes PATH inside generated bin/* and it is
# impossible to adjust it later )
environment =
PATH = ${postgresql:location}/bin:%(PATH)s
CPPFLAGS= -I${postgresql:location}/include
LDFLAGS = -L${postgresql:location}/lib -Wl,-rpath=${postgresql:location}/lib
PATH = ${postgresql:location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS= -I${postgresql:location}/include -I${icu:location}/include -I${kerberos:location}/include
LDFLAGS = -L${postgresql:location}/lib -Wl,-rpath=${postgresql:location}/lib -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib -L${kerberos:location}/lib -Wl,-rpath=${kerberos:location}/lib
......
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