Commit c79e080d authored by Jérome Perrin's avatar Jérome Perrin Committed by Thomas Gambier

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 ad5bb0c2
...@@ -33,12 +33,14 @@ init += ...@@ -33,12 +33,14 @@ init +=
(buildout['directory'], buildout['destdir'] + buildout['rootdir'])) (buildout['directory'], buildout['destdir'] + buildout['rootdir']))
[python3-common] [python3-common]
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}
[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 +=
...@@ -47,23 +49,28 @@ environment += ...@@ -47,23 +49,28 @@ environment +=
PERL5LIB=${perl:location}/lib/5.38.0/ PERL5LIB=${perl:location}/lib/5.38.0/
[intltool] [intltool]
shared = false
environment += environment +=
PERL5LIB=${perl:location}/lib/5.38.0/ PERL5LIB=${perl:location}/lib/5.38.0/
[autoconf] [autoconf]
shared = false
environment += environment +=
PERL5LIB=${perl:location}/lib/5.38.0/ PERL5LIB=${perl:location}/lib/5.38.0/
[automake] [automake]
shared = false
environment += environment +=
PERL5LIB=${perl:location}/lib/5.38.0/ PERL5LIB=${perl:location}/lib/5.38.0/
[firewalld] [firewalld]
shared = false
environment += environment +=
PERL5LIB=${perl:location}/lib/5.38.0/ PERL5LIB=${perl:location}/lib/5.38.0/
[dbus] [dbus]
shared = false
configure-options += configure-options +=
--prefix=${buildout:rootdir}/parts/${:_buildout_section_name_} --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
make-options += make-options +=
...@@ -75,12 +82,14 @@ post-install = ...@@ -75,12 +82,14 @@ 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
environment += environment +=
LD_LIBRARY_PATH=${dbus:location}/lib LD_LIBRARY_PATH=${dbus:location}/lib
DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include
[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 +=
...@@ -100,6 +109,7 @@ environment += ...@@ -100,6 +109,7 @@ environment +=
PERL5LIB=${perl:location}/lib/5.38.0/ PERL5LIB=${perl:location}/lib/5.38.0/
[gobject-introspection] [gobject-introspection]
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/python${python:version}-config sed -i 's#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#!${python:location}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
configure-options += configure-options +=
...@@ -110,17 +120,20 @@ post-install = ...@@ -110,17 +120,20 @@ post-install =
sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
[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/python${python:version}-config sed -i 's#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#!${python:location}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-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/python${python:version}-config sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
[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.38.0/ perl-PERL5LIB=${perl:location}/lib/5.38.0/
pre-configure = pre-configure =
...@@ -131,6 +144,7 @@ post-install = ...@@ -131,6 +144,7 @@ post-install =
sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm
[perl] [perl]
shared = false
configure-command = configure-command =
sh Configure -des \ sh Configure -des \
-Dprefix=${buildout:rootdir}/parts/${:_buildout_section_name_} \ -Dprefix=${buildout:rootdir}/parts/${:_buildout_section_name_} \
...@@ -144,12 +158,14 @@ environment += ...@@ -144,12 +158,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