Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nirina Malard
slapos
Commits
c2d532a2
Commit
c2d532a2
authored
Apr 11, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix OBS compilation after perl version up
perl was upgraded from version 5.26.1 to 5.28.1 in
8d4fa263
parent
e4d52f15
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
component/slapos/obs.cfg
component/slapos/obs.cfg
+12
-12
No files found.
component/slapos/obs.cfg
View file @
c2d532a2
...
@@ -42,23 +42,23 @@ make-options +=
...
@@ -42,23 +42,23 @@ make-options +=
DESTDIR=${buildout:destdir}
DESTDIR=${buildout:destdir}
environment +=
environment +=
PERL5LIB=${perl:location}/lib/5.2
6
.1/
PERL5LIB=${perl:location}/lib/5.2
8
.1/
[intltool]
[intltool]
environment +=
environment +=
PERL5LIB=${perl:location}/lib/5.2
6
.1/
PERL5LIB=${perl:location}/lib/5.2
8
.1/
[autoconf]
[autoconf]
environment +=
environment +=
PERL5LIB=${perl:location}/lib/5.2
6
.1/
PERL5LIB=${perl:location}/lib/5.2
8
.1/
[automake]
[automake]
environment +=
environment +=
PERL5LIB=${perl:location}/lib/5.2
6
.1/
PERL5LIB=${perl:location}/lib/5.2
8
.1/
[firewalld]
[firewalld]
environment +=
environment +=
PERL5LIB=${perl:location}/lib/5.2
6
.1/
PERL5LIB=${perl:location}/lib/5.2
8
.1/
[dbus]
[dbus]
...
@@ -99,7 +99,7 @@ make-options +=
...
@@ -99,7 +99,7 @@ make-options +=
DESTDIR=${buildout:destdir}
DESTDIR=${buildout:destdir}
environment =
environment =
PERL5LIB=${perl:location}/lib/5.2
6
.1/
PERL5LIB=${perl:location}/lib/5.2
8
.1/
PERL=${perl:location}/bin/perl
PERL=${perl:location}/bin/perl
[bison-go]
[bison-go]
...
@@ -124,7 +124,7 @@ environment +=
...
@@ -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
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
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
M4=${m4:location}/bin/m4
PERL5LIB=${perl:location}/lib/5.2
6
.1/
PERL5LIB=${perl:location}/lib/5.2
8
.1/
post-install =
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
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 +=
...
@@ -157,14 +157,14 @@ environment +=
[perl-CPAN-package]
[perl-CPAN-package]
perl-PERL5LIB=${perl:location}/lib/5.2
6
.1/
perl-PERL5LIB=${perl:location}/lib/5.2
8
.1/
pre-configure =
pre-configure =
sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/5.2
6
.1/*-linux-thread-multi/Config.pm
sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/5.2
8
.1/*-linux-thread-multi/Config.pm
sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/5.2
6
.1/*-linux-thread-multi/Config.pm
sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/5.2
8
.1/*-linux-thread-multi/Config.pm
post-install =
post-install =
sed -i "s#'${perl:location}#'/opt/slapos/parts/perl#" ${perl:location}/lib/5.2
6
.1/*-linux-thread-multi/Config.pm
sed -i "s#'${perl:location}#'/opt/slapos/parts/perl#" ${perl:location}/lib/5.2
8
.1/*-linux-thread-multi/Config.pm
sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.2
6
.1/*-linux-thread-multi/Config.pm
sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.2
8
.1/*-linux-thread-multi/Config.pm
[perl]
[perl]
location = ${buildout:destdir}/parts/perl
location = ${buildout:destdir}/parts/perl
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment