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
Léo-Paul Géneau
slapos
Commits
ee9d4a0f
Commit
ee9d4a0f
authored
Apr 05, 2020
by
Dmitry Blinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove excessive 'set -e' in profiles with slapos.recipe.cmmi
-e is already set by default in slapos.recipe.cmmi 0.13
parent
307dc455
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+3
-3
component/onlyoffice-core/buildout.cfg
component/onlyoffice-core/buildout.cfg
+1
-1
component/pole/buildout.cfg
component/pole/buildout.cfg
+1
-1
component/qt/buildout.cfg
component/qt/buildout.cfg
+1
-1
No files found.
component/mariadb/buildout.cfg
View file @
ee9d4a0f
...
@@ -34,7 +34,7 @@ version = 10.4.12
...
@@ -34,7 +34,7 @@ version = 10.4.12
md5sum = 97d7c0f508c04a31c138fdb24e95dbc4
md5sum = 97d7c0f508c04a31c138fdb24e95dbc4
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
pre-configure =
pre-configure =
set
-e
'\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake
set '\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake
grep -q "$@"
grep -q "$@"
sed -i "/$1/d" "$2"
sed -i "/$1/d" "$2"
configure-command = ${cmake:location}/bin/cmake
configure-command = ${cmake:location}/bin/cmake
...
@@ -81,7 +81,7 @@ environment =
...
@@ -81,7 +81,7 @@ environment =
patch-options = -p1
patch-options = -p1
patches =
patches =
https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.22-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.22-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
post-install =
set -e
post-install =
set -- wsrep-lib/wsrep-API/*/wsrep_api.h
set -- wsrep-lib/wsrep-API/*/wsrep_api.h
install -DpT $1 ${:location}/$1
install -DpT $1 ${:location}/$1
cp -a wsrep-lib/include ${:location}/wsrep-lib
cp -a wsrep-lib/include ${:location}/wsrep-lib
...
@@ -92,7 +92,7 @@ post-install = set -e
...
@@ -92,7 +92,7 @@ post-install = set -e
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = https://packages.groonga.org/source/mroonga/mroonga-9.12.tar.gz
url = https://packages.groonga.org/source/mroonga/mroonga-9.12.tar.gz
md5sum = d0af673f1bad3b9ccf33870bb2344a25
md5sum = d0af673f1bad3b9ccf33870bb2344a25
pre-configure =
set -e
pre-configure =
rm -rf fake_mariadb_source
rm -rf fake_mariadb_source
mkdir -p fake_mariadb_source
mkdir -p fake_mariadb_source
cd fake_mariadb_source
cd fake_mariadb_source
...
...
component/onlyoffice-core/buildout.cfg
View file @
ee9d4a0f
...
@@ -25,7 +25,7 @@ environment =
...
@@ -25,7 +25,7 @@ environment =
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${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
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 -x
mkdir -p ${:location}/bin ${:location}/lib
mkdir -p ${:location}/bin ${:location}/lib
mv -t ${:location}/lib build/lib/*/*.so
mv -t ${:location}/lib build/lib/*/*.so
mv -t ${:location}/bin build/bin/*/*
mv -t ${:location}/bin build/bin/*/*
...
...
component/pole/buildout.cfg
View file @
ee9d4a0f
...
@@ -12,7 +12,7 @@ make-binary =
...
@@ -12,7 +12,7 @@ make-binary =
make-options =
make-options =
make-targets = true
make-targets = true
post-install =
post-install =
set -
e -
x
set -x
mkdir bin
mkdir bin
cd pole
cd pole
g++ -o ../bin/poledump pole.cpp poledump.cpp
g++ -o ../bin/poledump pole.cpp poledump.cpp
...
...
component/qt/buildout.cfg
View file @
ee9d4a0f
...
@@ -47,7 +47,7 @@ url = http://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.
...
@@ -47,7 +47,7 @@ url = http://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.
md5sum = d990ee66bf7ab0c785589776f35ba6ad
md5sum = d990ee66bf7ab0c785589776f35ba6ad
# see https://github.com/NixOS/nixpkgs/blob/3e387c3e005c87566b5403d24c86f71f4945a79b/pkgs/development/libraries/qt-4.x/4.8/default.nix#L101
# see https://github.com/NixOS/nixpkgs/blob/3e387c3e005c87566b5403d24c86f71f4945a79b/pkgs/development/libraries/qt-4.x/4.8/default.nix#L101
pre-configure =
pre-configure =
set -
e -
x
set -x
sed 's,/usr/X11R6/lib64,${libX11:location}/lib64 ${xproto:location}/lib64 ${libXext:location}/lib64,g' -i mkspecs/*/*.conf
sed 's,/usr/X11R6/lib64,${libX11:location}/lib64 ${xproto:location}/lib64 ${libXext:location}/lib64,g' -i mkspecs/*/*.conf
sed 's,/usr/X11R6/lib,${libX11:location}/lib ${xproto:location}/lib ${libXext:location}/lib,g' -i mkspecs/*/*.conf
sed 's,/usr/X11R6/lib,${libX11:location}/lib ${xproto:location}/lib ${libXext:location}/lib,g' -i mkspecs/*/*.conf
sed 's,/usr/X11R6/include,${libX11:location}/include ${xproto:location}/include ${libXext:location}/include,g' -i mkspecs/*/*.conf
sed 's,/usr/X11R6/include,${libX11:location}/include ${xproto:location}/include ${libXext:location}/include,g' -i mkspecs/*/*.conf
...
...
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