Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
0e9596f4
Commit
0e9596f4
authored
Aug 06, 2016
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: luac: add luac cross-compiler
parent
153ebafd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
3 deletions
+20
-3
contrib/src/lua/rules.mak
contrib/src/lua/rules.mak
+17
-3
contrib/src/main.mak
contrib/src/main.mak
+3
-0
No files found.
contrib/src/lua/rules.mak
View file @
0e9596f4
...
...
@@ -25,12 +25,12 @@ LUA_TARGET := solaris
endif
# Feel free to add autodetection if you need to...
PKGS
+=
lua
PKGS
+=
lua
luac
ifeq
($(call need_pkg,"lua5.2"),)
PKGS_FOUND
+=
lua
PKGS_FOUND
+=
lua
luac
endif
ifeq
($(call need_pkg,"lua5.1"),)
PKGS_FOUND
+=
lua
PKGS_FOUND
+=
lua
luac
endif
$(TARBALLS)/lua-$(LUA_VERSION).tar.gz
:
...
...
@@ -81,3 +81,17 @@ ifdef HAVE_WIN32
cp
$<
/etc/lua.pc
"
$(PREFIX)
/lib/pkgconfig/"
endif
touch
$@
luac
:
lua-$(LUA_VERSION).tar.gz .sum-lua
# DO NOT use the same intermediate directory as the lua target
rm
-Rf
--
$@
-
$(LUA_VERSION)
$@
mkdir
--
$@
-
$(LUA_VERSION)
tar
-x
-v
-z
-C
$@
-
$(LUA_VERSION)
--strip-components
=
1
-f
$<
(
cd
luac-
$(LUA_VERSION)
&&
patch
-p1
)
<
$(SRC)
/lua/luac-32bits.patch
mv
luac-
$(LUA_VERSION)
luac
.luac
:
luac
cd
$<
&&
$(MAKE)
generic
mkdir
-p
--
$(BUILDBINDIR)
cp
-fv
--
$<
/src/luac
$(BUILDBINDIR)
/
$(HOST)
-luac
touch
$@
contrib/src/main.mak
View file @
0e9596f4
...
...
@@ -32,6 +32,9 @@ CONTRIB_VIDEOLAN := http://downloads.videolan.org/pub/contrib
PREFIX
?=
$(TOPDST)
/
$(HOST)
PREFIX
:=
$(
abspath
$(PREFIX)
)
BUILDPREFIX
?=
$(TOPDST)
BUILDPREFIX
:=
$(
abspath
$(BUILDPREFIX)
)
BUILDBINDIR
?=
$(BUILDPREFIX)
/bin
ifneq
($(HOST),$(BUILD))
HAVE_CROSS_COMPILE
=
1
endif
...
...
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