From c2d532a2c42764c31121f30d160ca46b86d07d31 Mon Sep 17 00:00:00 2001 From: Thomas Gambier Date: Thu, 11 Apr 2019 10:54:40 +0200 Subject: [PATCH] fix OBS compilation after perl version up perl was upgraded from version 5.26.1 to 5.28.1 in 8d4fa2630f587a32b20a8d27ac6060088e102aa4 --- component/slapos/obs.cfg | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/component/slapos/obs.cfg b/component/slapos/obs.cfg index 39cd1e4..129fc20 100644 --- a/component/slapos/obs.cfg +++ b/component/slapos/obs.cfg @@ -42,23 +42,23 @@ make-options += DESTDIR=${buildout:destdir} environment += - PERL5LIB=${perl:location}/lib/5.26.1/ + PERL5LIB=${perl:location}/lib/5.28.1/ [intltool] environment += - PERL5LIB=${perl:location}/lib/5.26.1/ + PERL5LIB=${perl:location}/lib/5.28.1/ [autoconf] environment += - PERL5LIB=${perl:location}/lib/5.26.1/ + PERL5LIB=${perl:location}/lib/5.28.1/ [automake] environment += - PERL5LIB=${perl:location}/lib/5.26.1/ + PERL5LIB=${perl:location}/lib/5.28.1/ [firewalld] environment += - PERL5LIB=${perl:location}/lib/5.26.1/ + PERL5LIB=${perl:location}/lib/5.28.1/ [dbus] @@ -99,7 +99,7 @@ make-options += DESTDIR=${buildout:destdir} environment = - PERL5LIB=${perl:location}/lib/5.26.1/ + PERL5LIB=${perl:location}/lib/5.28.1/ PERL=${perl:location}/bin/perl [bison-go] @@ -124,7 +124,7 @@ environment += LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi -L${python2.7:location}/lib ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal:${glib:location}/share/aclocal:${intltool:location}/share/aclocal M4=${m4:location}/bin/m4 - PERL5LIB=${perl:location}/lib/5.26.1/ + PERL5LIB=${perl:location}/lib/5.28.1/ post-install = sed -i 's#!${python2.7:location}/bin/python2.7#!/opt/slapos/parts/python2.7/bin/python2.7#' ${python2.7:location}/bin/python-config @@ -157,14 +157,14 @@ environment += [perl-CPAN-package] -perl-PERL5LIB=${perl:location}/lib/5.26.1/ +perl-PERL5LIB=${perl:location}/lib/5.28.1/ pre-configure = - sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/5.26.1/*-linux-thread-multi/Config.pm - sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/5.26.1/*-linux-thread-multi/Config.pm + sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/5.28.1/*-linux-thread-multi/Config.pm + sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/5.28.1/*-linux-thread-multi/Config.pm post-install = - sed -i "s#'${perl:location}#'/opt/slapos/parts/perl#" ${perl:location}/lib/5.26.1/*-linux-thread-multi/Config.pm - sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.26.1/*-linux-thread-multi/Config.pm + sed -i "s#'${perl:location}#'/opt/slapos/parts/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] location = ${buildout:destdir}/parts/perl -- libgit2 0.24.0