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
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
Tristan Cavelier
slapos
Commits
7f92fac0
Commit
7f92fac0
authored
Mar 02, 2017
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xxx component/onlyoffice-core: compile with slapos boost!!!
parent
0ae4489d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
7 deletions
+15
-7
component/onlyoffice-core/buildout.cfg
component/onlyoffice-core/buildout.cfg
+15
-7
No files found.
component/onlyoffice-core/buildout.cfg
View file @
7f92fac0
...
@@ -10,11 +10,12 @@ extends =
...
@@ -10,11 +10,12 @@ extends =
## for 3dparty dependencies
## for 3dparty dependencies
# ../git/buildout.cfg
# ../git/buildout.cfg
../bash/buildout.cfg
../bash/buildout.cfg
../bzip2/buildout.cfg
../zlib/buildout.cfg
# for qmake
# for qmake
../qt/buildout.cfg
../qt/buildout.cfg
# for wrapper
# for wrapper
../dash/buildout.cfg
../dash/buildout.cfg
# XXX qmake ! use pre-configure !!
parts +=
parts +=
onlyoffice-core
onlyoffice-core
...
@@ -68,8 +69,8 @@ pre-configure =
...
@@ -68,8 +69,8 @@ pre-configure =
sed 's@qmake -r@qmake -r -spec ${qt5-qmake:location}/qtbase/mkspecs/linux-g++ '"'QMAKE_CXXFLAGS +=$qmake_cxxflags' 'QMAKE_LFLAGS +=$qmake_lflags'@g" -i Makefile
sed 's@qmake -r@qmake -r -spec ${qt5-qmake:location}/qtbase/mkspecs/linux-g++ '"'QMAKE_CXXFLAGS +=$qmake_cxxflags' 'QMAKE_LFLAGS +=$qmake_lflags'@g" -i Makefile
bash="${bash:location}/bin/bash"
bash="${bash:location}/bin/bash"
( cd Common/3dParty/boost && "$bash" fetch.sh )
#
( cd Common/3dParty/boost && "$bash" fetch.sh )
( cd Common/3dParty/boost && "$bash" build.sh )
#
( cd Common/3dParty/boost && "$bash" build.sh )
# ( cd Common/3dParty/v8 && "$bash" fetch.sh )
# ( cd Common/3dParty/v8 && "$bash" fetch.sh )
# ( cd Common/3dParty/v8 && "$bash" build.sh )
# ( cd Common/3dParty/v8 && "$bash" build.sh )
tar xf ../../tristan__compile__/3dpartycompiled-noicu-nocef-noboost.tar.gz
tar xf ../../tristan__compile__/3dpartycompiled-noicu-nocef-noboost.tar.gz
...
@@ -91,7 +92,7 @@ pre-configure =
...
@@ -91,7 +92,7 @@ pre-configure =
#cp -aT ${onlyoffice-boost-lib-1.58.0-shared:location}/lib Common/3dParty/boost/boost_1_58_0/build/slapos/static_fpic
#cp -aT ${onlyoffice-boost-lib-1.58.0-shared:location}/lib Common/3dParty/boost/boost_1_58_0/build/slapos/static_fpic
#cp -aT ${onlyoffice-boost-lib-1.58.0-shared:location}/include/boost Common/3dParty/boost/boost_1_58_0/boost
#cp -aT ${onlyoffice-boost-lib-1.58.0-shared:location}/include/boost Common/3dParty/boost/boost_1_58_0/boost
#mv Common/3dParty/boost/boost_1_58_0/build/slapos Common/3dParty/boost/boost_1_58_0/build/linux_64
#mv Common/3dParty/boost/boost_1_58_0/build/slapos Common/3dParty/boost/boost_1_58_0/build/linux_64
true
cp -at Common/3dParty/boost/boost_1_58_0 ${onlyoffice-boost-lib-1.58.0-shared:location}/*
cp -at Common/3dParty/boost/boost_1_58_0 ${onlyoffice-boost-lib-1.58.0-shared:location}/*
# XXX use precompiled from old onlyoffice (that was not failing to link boost_regex)
# XXX use precompiled from old onlyoffice (that was not failing to link boost_regex)
#true cp -aT ${boost-lib-1.58.0:location}/../tristan__compile__/Common/3dParty/boost/boost_1_58_0/build Common/3dParty/boost/boost_1_58_0/build
#true cp -aT ${boost-lib-1.58.0:location}/../tristan__compile__/Common/3dParty/boost/boost_1_58_0/build Common/3dParty/boost/boost_1_58_0/build
#true cp -aT ${boost-lib-1.58.0:location}/../tristan__compile__/Common/3dParty/boost/boost_1_58_0/boost Common/3dParty/boost/boost_1_58_0/boost
#true cp -aT ${boost-lib-1.58.0:location}/../tristan__compile__/Common/3dParty/boost/boost_1_58_0/boost Common/3dParty/boost/boost_1_58_0/boost
...
@@ -138,13 +139,16 @@ post-install =
...
@@ -138,13 +139,16 @@ post-install =
[onlyoffice-boost-lib-1.58.0-shared]
[onlyoffice-boost-lib-1.58.0-shared]
<= boost-lib-1.58.0
<= boost-lib-1.58.0
url = http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.tar.gz
#url = http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.tar.gz
url = file:///srv/slapgrid/slappart5/srv/runner/software/54826ed729fc99624fbe090c6977515b/parts/tristan__compile__/boost_1_58_0.tar.gz
md5sum = 5a5d5614d9a07672e1ab2a250b5defc5
md5sum = 5a5d5614d9a07672e1ab2a250b5defc5
#configure-command = ./bootstrap.sh --prefix=${:location} --with-python=${python2.7:location}/bin/python2.7 --with-libraries=filesystem,system,date_time,regex
#configure-command = ./bootstrap.sh --prefix=${:location} --with-python=${python2.7:location}/bin/python2.7 --with-libraries=filesystem,system,date_time,regex
configure-command = ./bootstrap.sh --with-libraries=filesystem,system,date_time,regex
configure-command = ./bootstrap.sh --with-libraries=filesystem,system,date_time,regex
--with-icu=${icu4c-55.1:location}
make-targets = true
make-targets = true
post-install =
post-install =
set -e -x
set -e -x
# echo "${:environment}"
# false
mkdir -p build/linux_64/static && ./b2 --clean && ./bjam link=static && cp stage/lib/* build/linux_64/static
mkdir -p build/linux_64/static && ./b2 --clean && ./bjam link=static && cp stage/lib/* build/linux_64/static
mkdir -p build/linux_64/static_fpic && ./b2 --clean && ./bjam link=static cxxflags=-fPIC && cp stage/lib/* build/linux_64/static_fpic
mkdir -p build/linux_64/static_fpic && ./b2 --clean && ./bjam link=static cxxflags=-fPIC && cp stage/lib/* build/linux_64/static_fpic
mkdir -p build/linux_64/shared && ./b2 --clean && ./bjam link=shared && cp stage/lib/* build/linux_64/shared
mkdir -p build/linux_64/shared && ./b2 --clean && ./bjam link=shared && cp stage/lib/* build/linux_64/shared
...
@@ -159,9 +163,13 @@ post-install =
...
@@ -159,9 +163,13 @@ post-install =
# cp stage/lib/* build/linux_64/static/
# cp stage/lib/* build/linux_64/static/
# cp stage/lib/* build/linux_64/static_fpic/
# cp stage/lib/* build/linux_64/static_fpic/
# mv -t ${:location} *
# mv -t ${:location} *
environment
+
=
environment =
PATH=${gcc:location}/bin:${binutils:location}/bin:%(PATH)s
PATH=${gcc:location}/bin:${binutils:location}/bin:%(PATH)s
LD_LIBRARY_PATH=${gcc:location}/lib64:${gcc:location}/lib:${binutils:location}/lib
LD_LIBRARY_PATH=${gcc:location}/lib64:${gcc:location}/lib:${binutils:location}/lib
BZIP2_INCLUDE=${bzip2:location}/include
BZIP2_LIBPATH=${bzip2:location}/lib
ZLIB_INCLUDE=${zlib:location}/include
ZLIB_LIBPATH=${zlib:location}/lib
[onlyoffice-boost-lib-1.58.0-static]
[onlyoffice-boost-lib-1.58.0-static]
<= boost-lib-1.58.0
<= boost-lib-1.58.0
...
...
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