Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
tarantool
Commits
4777241e
Commit
4777241e
authored
12 years ago
by
Roman Tsisyk
Browse files
Options
Downloads
Patches
Plain Diff
Add luajit as a submodule and fix cmake/luajit.cmake
parent
94477bdc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitmodules
+3
-0
3 additions, 0 deletions
.gitmodules
cmake/luajit.cmake
+0
-6
0 additions, 6 deletions
cmake/luajit.cmake
third_party/README
+2
-5
2 additions, 5 deletions
third_party/README
third_party/luajit
+1
-0
1 addition, 0 deletions
third_party/luajit
with
6 additions
and
11 deletions
.gitmodules
0 → 100644
+
3
−
0
View file @
4777241e
[submodule "third_party/luajit"]
path = third_party/luajit
url = http://luajit.org/git/luajit-2.0.git
This diff is collapsed.
Click to expand it.
cmake/luajit.cmake
+
0
−
6
View file @
4777241e
...
...
@@ -152,9 +152,6 @@ macro(luajit_build)
add_custom_command
(
OUTPUT
${
PROJECT_BINARY_DIR
}
/third_party/luajit/src/libluajit.a
WORKING_DIRECTORY
${
PROJECT_BINARY_DIR
}
/third_party/luajit
COMMAND $
(
MAKE
)
clean
COMMAND $
(
MAKE
)
-C src -t buildvm_x86.h buildvm_arm.h
buildvm_x64.h buildvm_x64win.h buildvm_ppc.h
buildvm_ppcspe.h
COMMAND $
(
MAKE
)
-C src
${
luajit_buildoptions
}
DEPENDS
${
CMAKE_SOURCE_DIR
}
/CMakeCache.txt
)
...
...
@@ -166,9 +163,6 @@ macro(luajit_build)
WORKING_DIRECTORY
${
PROJECT_BINARY_DIR
}
/third_party/luajit
COMMAND cp -r
${
PROJECT_SOURCE_DIR
}
/third_party/luajit/* .
COMMAND $
(
MAKE
)
clean
COMMAND $
(
MAKE
)
-C src -t buildvm_x86.h buildvm_arm.h
buildvm_x64.h buildvm_x64win.h buildvm_ppc.h
buildvm_ppcspe.h
COMMAND $
(
MAKE
)
-C src
${
luajit_buildoptions
}
DEPENDS
${
PROJECT_BINARY_DIR
}
/CMakeCache.txt
${
PROJECT_BINARY_DIR
}
/third_party/luajit
)
...
...
This diff is collapsed.
Click to expand it.
third_party/README
+
2
−
5
View file @
4777241e
...
...
@@ -11,11 +11,8 @@ cvs up
How to update luajit
====================
- download the latest release source tarball
- replace the contents of the luajit directory
with the contents of the tarball
- merge the original Makefile and the Makefile
from the new tarball.
Run from project root dir:
git submodule update --reference v2.0.1-fixed -- third_party/luajit
How to update libobjc2
======================
...
...
This diff is collapsed.
Click to expand it.
luajit
@
e7633dba
Subproject commit e7633dba1e446763454a7969ce7e27139debc6cd
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