Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
picodata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
picodata
Commits
a12949dc
Commit
a12949dc
authored
2 years ago
by
Дмитрий Кибирев
Committed by
Yaroslav Dynnikov
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix: change debug to release, fix pack in centos7
parent
62917471
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!382
fix: change debug to release, fix pack in centos7
Pipeline
#13881
passed
2 years ago
Stage: test
Changes
2
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+3
-2
3 additions, 2 deletions
Makefile
rpm/picodata.spec
+1
-1
1 addition, 1 deletion
rpm/picodata.spec
with
4 additions
and
3 deletions
Makefile
+
3
−
2
View file @
a12949dc
...
...
@@ -4,11 +4,12 @@ default: ;
install-cargo
:
curl
--proto
'=https'
--tlsv1
.2
-sSf
https://sh.rustup.rs |
\
sh
-s
--
-y
--profile
default
--default-toolchain
1.6
4
.0
sh
-s
--
-y
--profile
default
--default-toolchain
1.6
5
.0
centos7-cmake3
:
[
-f
/usr/bin/cmake
]
&&
sudo rm
/usr/bin/cmake
sudo ln
-s
/usr/bin/cmake3 /usr/bin/cmake
sudo sed
-i
's/*link_gomp: /*link_gomp: --fPIE/g'
$$(
find /opt
-name
libgomp.spec
)
reset-submodules
:
git submodule foreach
--recursive
'git clean -dxf && git reset --hard'
...
...
@@ -28,7 +29,7 @@ build-release: tarantool-patch
install
:
mkdir
-p
$(
DESTDIR
)
/usr/bin
install
-m
0755 target/
debug
/picodata
$(
DESTDIR
)
/usr/bin/picodata
install
-m
0755 target/
*
/picodata
$(
DESTDIR
)
/usr/bin/picodata
fmt
:
cargo
fmt
...
...
This diff is collapsed.
Click to expand it.
rpm/picodata.spec
+
1
−
1
View file @
a12949dc
...
...
@@ -38,7 +38,7 @@ make install-cargo
%if %use_cmake3
make centos7-cmake3
%endif
make build
make build
-release
%install
%make_install
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment