Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
4648c6b2
Commit
4648c6b2
authored
Feb 09, 2018
by
Boris Kocherov
Committed by
Romain Courteaud
Feb 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/onlyoffice-core: add lib64 folder for correct use slaposgcc on 64 platform
parent
316049bf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
component/icu/buildout.cfg
component/icu/buildout.cfg
+2
-2
component/onlyoffice-core/buildout.cfg
component/onlyoffice-core/buildout.cfg
+1
-1
component/qt/buildout.cfg
component/qt/buildout.cfg
+1
-1
No files found.
component/icu/buildout.cfg
View file @
4648c6b2
...
@@ -20,8 +20,8 @@ configure-options =
...
@@ -20,8 +20,8 @@ configure-options =
<= icu4c
<= icu4c
environment =
environment =
PATH=${gcc:location}/bin:%(PATH)s
PATH=${gcc:location}/bin:%(PATH)s
LD_LIBRARY_PATH=${gcc:location}/lib
LD_LIBRARY_PATH=${gcc:location}/lib
:${gcc:location}/lib64
LDFLAGS=-Wl,-rpath=${gcc:location}/lib
LDFLAGS=-Wl,-rpath=${gcc:location}/lib
-Wl,-rpath=${gcc:location}/lib64
[icu]
[icu]
<= icu4c
<= icu4c
...
...
component/onlyoffice-core/buildout.cfg
View file @
4648c6b2
...
@@ -22,7 +22,7 @@ make-targets = lib bin
...
@@ -22,7 +22,7 @@ make-targets = lib bin
environment =
environment =
PATH=${gcc:location}/bin:${qt5-qmake:location}/bin:%(PATH)s
PATH=${gcc:location}/bin:${qt5-qmake:location}/bin:%(PATH)s
CXXFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${icu4c-slaposgcc:location}/include -I${boost-lib:location}/include -Wno-comment -Wno-deprecated-declarations -Wno-endif-labels -Wno-parentheses -Wno-reorder -Wno-sign-compare -Wno-switch -Wno-unknown-pragmas -Wno-unused
CXXFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${icu4c-slaposgcc:location}/include -I${boost-lib:location}/include -Wno-comment -Wno-deprecated-declarations -Wno-endif-labels -Wno-parentheses -Wno-reorder -Wno-sign-compare -Wno-switch -Wno-unknown-pragmas -Wno-unused
LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${icu4c-slaposgcc:location}/lib -Wl,-rpath=${icu4c-slaposgcc:location}/lib -L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -Wl,-rpath=${:location}/lib
LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${
gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${
libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${icu4c-slaposgcc:location}/lib -Wl,-rpath=${icu4c-slaposgcc:location}/lib -L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -Wl,-rpath=${:location}/lib
post-install =
post-install =
set -e -x
set -e -x
mkdir -p ${:location}/bin ${:location}/lib
mkdir -p ${:location}/bin ${:location}/lib
...
...
component/qt/buildout.cfg
View file @
4648c6b2
...
@@ -25,7 +25,7 @@ configure-options =
...
@@ -25,7 +25,7 @@ configure-options =
environment =
environment =
PATH=${gcc:location}/bin:%(PATH)s
PATH=${gcc:location}/bin:%(PATH)s
CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${libXext:location}/include
CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${libXext:location}/include
LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib
LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${
gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${
libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib
make-binary = true
make-binary = true
post-install =
post-install =
mkdir -p ${:location}/bin
mkdir -p ${:location}/bin
...
...
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