Skip to content

more luajit fixes #3436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaniini merged 2 commits into from
Jul 6, 2023
Merged

more luajit fixes #3436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
825b706
luajit: fix up symlink locations and targets
kaniini Jul 6, 2023
b97b033
lua-cjson: use wolfi-baselayout
kaniini Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lua-cjson.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: lua-cjson
version: 2.1.0.10
epoch: 1
epoch: 2
description: "Lua CJSON is a fast JSON encoding/parsing module for Lua"
copyright:
- license: MIT
Expand All @@ -11,7 +11,7 @@ package:
environment:
contents:
packages:
- wolfi-base
- wolfi-baselayout
- busybox
- build-base
- ca-certificates-bundle
Expand Down
8 changes: 4 additions & 4 deletions luajit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: luajit
version: 2.1_p20210510
epoch: 2
epoch: 3
description: OpenResty's branch of LuaJIT
copyright:
- license: MIT
Expand All @@ -22,14 +22,14 @@ pipeline:
uri: https://github.com/openresty/luajit2/archive/v2.1-20210510/luajit${{package.version}}.tar.gz

- runs: |
export LUAJIT_LIB=${{targets.destdir}}/usr/lib
export LUAJIT_LIB=/usr/lib
export LUA_LIB_DIR="$LUAJIT_LIB/lua"
export LUAJIT_INC=${{targets.destdir}}/usr/include/luajit-2.1
export LUAJIT_INC=/usr/include/luajit-2.1

make CCDEBUG=-g
make DESTDIR="${{targets.destdir}}" install PREFIX=/usr

ln -s ${{targets.destdir}}/usr/bin/luajit ${{targets.destdir}}/usr/bin/lua
ln -s luajit ${{targets.destdir}}/usr/bin/lua
ln -s "$LUAJIT_INC" ${{targets.destdir}}/usr/include/lua

subpackages:
Expand Down