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
6a4a766d
Commit
6a4a766d
authored
1 year ago
by
Georgy Moshkin
Browse files
Options
Downloads
Patches
Plain Diff
build: rebase tarantool-sys onto 2.11.0-rc2
parent
c10ccaed
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!498
build: rebase tarantool-sys onto 2.11.0-rc2
Pipeline
#17326
passed
1 year ago
Stage: build-base-image
Stage: test
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
build.rs
+1
-2
1 addition, 2 deletions
build.rs
docker-build-base/Dockerfile
+1
-1
1 addition, 1 deletion
docker-build-base/Dockerfile
tarantool-sys
+1
-1
1 addition, 1 deletion
tarantool-sys
with
3 additions
and
4 deletions
build.rs
+
1
−
2
View file @
6a4a766d
...
...
@@ -250,7 +250,6 @@ fn build_tarantool(build_root: &Path) {
rustc
::
link_lib_static
(
"box_error"
);
rustc
::
link_lib_static
(
"xlog"
);
rustc
::
link_lib_static
(
"crc32"
);
rustc
::
link_lib_static
(
"scramble"
);
rustc
::
link_lib_static
(
"stat"
);
rustc
::
link_lib_static
(
"shutdown"
);
rustc
::
link_lib_static
(
"swim_udp"
);
...
...
@@ -269,7 +268,7 @@ fn build_tarantool(build_root: &Path) {
// These two must be linked as positional arguments, because they define
// duplicate symbols which is not allowed (by default) when linking with
// via -l... option
let
lib_dir
=
format!
(
"{b}/{tarantool_prefix}/
build
/libunwind/
dest/
lib"
);
let
lib_dir
=
format!
(
"{b}/{tarantool_prefix}/
third_party
/libunwind/
src/.
lib
s
"
);
rustc
::
link_arg
(
format!
(
"{lib_dir}/libunwind-x86_64.a"
));
rustc
::
link_arg
(
format!
(
"{lib_dir}/libunwind.a"
));
}
...
...
This diff is collapsed.
Click to expand it.
docker-build-base/Dockerfile
+
1
−
1
View file @
6a4a766d
...
...
@@ -5,7 +5,7 @@ RUN set -e; \
apt
install
-y
\
build-essential
\
git unzip wget curl
\
cmake make
\
libtool autoconf
cmake make
\
python3
\
python3-yaml
\
python3-six
\
...
...
This diff is collapsed.
Click to expand it.
tarantool-sys
@
a2c6bae6
Subproject commit
9912156edff232522ac35b950199fdb00654e772
Subproject commit
a2c6bae6a2ba068f42e14a7b37a2e73882efc233
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