Commit 4b25b210 authored by Jérome Perrin's avatar Jérome Perrin

component/slapos: explicitly install everything in non-shared mode

When this is used in production, the slapos.cfg does not have shared
parts enabled, but disabling explicitly makes it easier to test, because
in testing environment we have shared parts enabled by default.
parent 4da31147
...@@ -22,12 +22,14 @@ download-cache = download-cache ...@@ -22,12 +22,14 @@ download-cache = download-cache
# Instead of: # Instead of:
# ./configure --prefix=INSTALL_DIRECTORY && make install DESTDIR=BUILD_DIRECTORY # ./configure --prefix=INSTALL_DIRECTORY && make install DESTDIR=BUILD_DIRECTORY
[python2.7] [python2.7]
shared = false
configure-options += configure-options +=
--prefix=${buildout:rootdir}/parts/${:_buildout_section_name_} --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
environment += environment +=
DESTDIR=${buildout:destdir} DESTDIR=${buildout:destdir}
[gettext] [gettext]
shared = false
# Add gettext library path to RPATH as its binaries are used to build # Add gettext library path to RPATH as its binaries are used to build
# glib for example # glib for example
environment = environment =
...@@ -36,6 +38,7 @@ environment = ...@@ -36,6 +38,7 @@ environment =
LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${buildout:builddir}/parts/${:_buildout_section_name_}/lib LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${buildout:builddir}/parts/${:_buildout_section_name_}/lib
[bison] [bison]
shared = false
configure-options += configure-options +=
--prefix=${buildout:rootdir}/parts/${:_buildout_section_name_} --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
make-options += make-options +=
...@@ -45,23 +48,28 @@ environment += ...@@ -45,23 +48,28 @@ environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.28.1/
[intltool] [intltool]
shared = false
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.28.1/
[autoconf] [autoconf]
shared = false
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.28.1/
[automake] [automake]
shared = false
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.28.1/
[firewalld] [firewalld]
shared = false
environment += environment +=
PERL5LIB=${perl:location}/lib/5.28.1/ PERL5LIB=${perl:location}/lib/5.28.1/
[dbus] [dbus]
shared = false
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
configure-options += configure-options +=
--prefix=${buildout:rootdir}/parts/${:_buildout_section_name_} --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
...@@ -74,6 +82,7 @@ post-install = ...@@ -74,6 +82,7 @@ post-install =
mkdir -p ${buildout:destdir}/parts/${:_buildout_section_name_}/var/run/dbus mkdir -p ${buildout:destdir}/parts/${:_buildout_section_name_}/var/run/dbus
[dbus-glib] [dbus-glib]
shared = false
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
environment += environment +=
LD_LIBRARY_PATH=${dbus:location}/lib LD_LIBRARY_PATH=${dbus:location}/lib
...@@ -81,6 +90,7 @@ environment += ...@@ -81,6 +90,7 @@ environment +=
[dbus-python] [dbus-python]
shared = false
pre-configure = pre-configure =
sed -i 's#/opt/slapos/parts/dbus/lib/libdbus-1.la#${dbus:location}/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la sed -i 's#/opt/slapos/parts/dbus/lib/libdbus-1.la#${dbus:location}/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
environment += environment +=
...@@ -92,6 +102,7 @@ post-install = ...@@ -92,6 +102,7 @@ post-install =
sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
[openssl] [openssl]
shared = false
prefix = ${buildout:rootdir}/parts/${:_buildout_section_name_} prefix = ${buildout:rootdir}/parts/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
make-options += make-options +=
...@@ -103,12 +114,14 @@ environment = ...@@ -103,12 +114,14 @@ environment =
PERL=${perl:location}/bin/perl PERL=${perl:location}/bin/perl
[bison-go] [bison-go]
shared = false
<= bison <= bison
configure-options = configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_} --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
make-options = make-options =
[gobject-introspection] [gobject-introspection]
shared = false
pre-configure = pre-configure =
sed -i 's#!/opt/slapos/parts/python2.7/bin/python2.7#!${python2.7:location}/bin/python2.7#' ${python2.7:location}/bin/python2.7-config sed -i 's#!/opt/slapos/parts/python2.7/bin/python2.7#!${python2.7:location}/bin/python2.7#' ${python2.7:location}/bin/python2.7-config
configure-options += configure-options +=
...@@ -121,12 +134,14 @@ post-install = ...@@ -121,12 +134,14 @@ post-install =
rm -rf ${bison-go:location} rm -rf ${bison-go:location}
[pygobject3] [pygobject3]
shared = false
pre-configure += pre-configure +=
sed -i 's#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#!${python:location}/bin/python${python:version}#' ${python:location}/bin/python2.7-config sed -i 's#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#!${python:location}/bin/python${python:version}#' ${python:location}/bin/python2.7-config
post-install = post-install =
sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python2.7-config sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python2.7-config
[ncurses] [ncurses]
shared = false
configure-options = configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_} --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--with-shared --with-shared
...@@ -139,11 +154,13 @@ configure-options = ...@@ -139,11 +154,13 @@ configure-options =
--enable-rpath --enable-rpath
[flex] [flex]
shared = false
environment += environment +=
BISON_PKGDATADIR=${bison:location}/share/bison/ BISON_PKGDATADIR=${bison:location}/share/bison/
[perl-CPAN-package] [perl-CPAN-package]
shared = false
perl-PERL5LIB=${perl:location}/lib/5.28.1/ perl-PERL5LIB=${perl:location}/lib/5.28.1/
pre-configure = pre-configure =
...@@ -154,6 +171,7 @@ post-install = ...@@ -154,6 +171,7 @@ post-install =
sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.28.1/*-linux-thread-multi/Config.pm sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.28.1/*-linux-thread-multi/Config.pm
[perl] [perl]
shared = false
location = ${buildout:destdir}/parts/perl location = ${buildout:destdir}/parts/perl
configure-command = configure-command =
sh Configure -des \ sh Configure -des \
...@@ -168,12 +186,14 @@ environment += ...@@ -168,12 +186,14 @@ environment +=
DESTDIR=${buildout:destdir} DESTDIR=${buildout:destdir}
[iptables] [iptables]
shared = false
configure-options += configure-options +=
--prefix=${buildout:rootdir}/parts/${:_buildout_section_name_} --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
environment += environment +=
DESTDIR=${buildout:destdir} DESTDIR=${buildout:destdir}
[swig] [swig]
shared = false
configure-options += configure-options +=
--prefix=${buildout:rootdir}/parts/${:_buildout_section_name_} --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
environment += environment +=
......
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