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
Eteri
slapos
Commits
05bfa168
Commit
05bfa168
authored
Mar 22, 2017
by
Kazuhiko Shiozaki
Committed by
Julien Muchembled
Mar 23, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mariarocks: build with SlapOS gcc for C+11
parent
aa5aa9e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+2
-1
component/mariadb/mariarocks.cfg
component/mariadb/mariarocks.cfg
+5
-0
No files found.
component/mariadb/buildout.cfg
View file @
05bfa168
...
@@ -54,7 +54,8 @@ configure-options =
...
@@ -54,7 +54,8 @@ configure-options =
-DWITHOUT_DAEMON_EXAMPLE=1
-DWITHOUT_DAEMON_EXAMPLE=1
-DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
-DCMAKE_INSTALL_RPATH=${:CMAKE_INSTALL_RPATH}
CMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
environment =
environment =
CMAKE_PROGRAM_PATH=${cmake:location}/bin
CMAKE_PROGRAM_PATH=${cmake:location}/bin
CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include
CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include
...
...
component/mariadb/mariarocks.cfg
View file @
05bfa168
...
@@ -12,13 +12,18 @@ pre-configure =
...
@@ -12,13 +12,18 @@ pre-configure =
${:clean}
${:clean}
${git:location}/bin/git submodule update --init
${git:location}/bin/git submodule update --init
sed -i -e '/(rc == -1 || errno == EINTR)/s/||/\&\&/' libmariadb/plugins/pvio/pvio_socket.c
sed -i -e '/(rc == -1 || errno == EINTR)/s/||/\&\&/' libmariadb/plugins/pvio/pvio_socket.c
sed -i -e 's, rocksdblib, rocksdblib "rt",' storage/rocksdb/CMakeLists.txt
post-install +=
post-install +=
${:clean}
${:clean}
clean =
clean =
${git:location}/bin/git clean -Xdf
${git:location}/bin/git clean -Xdf
${git:location}/bin/git submodule foreach ${git:location}/bin/git clean -Xdf
${git:location}/bin/git submodule foreach ${git:location}/bin/git clean -Xdf
${git:location}/bin/git -C libmariadb checkout plugins/pvio/pvio_socket.c
${git:location}/bin/git -C libmariadb checkout plugins/pvio/pvio_socket.c
${git:location}/bin/git checkout storage/rocksdb/CMakeLists.txt
configure-options +=
configure-options +=
-DPLUGIN_DAEMON_EXAMPLE=NO
-DPLUGIN_DAEMON_EXAMPLE=NO
-DPLUGIN_EXAMPLE=NO
-DPLUGIN_EXAMPLE=NO
-DCMAKE_C_COMPILER=${gcc:location}/bin/gcc
-DCMAKE_CXX_COMPILER=${gcc:location}/bin/g++
-DCMAKE_INSTALL_RPATH=${gcc:location}/lib:${gcc:location}/lib64:${:CMAKE_INSTALL_RPATH}
-DCMAKE_PROGRAM_PATH=${bison:location}/bin
-DCMAKE_PROGRAM_PATH=${bison: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