dany/antos
1
0
Fork 0
mirror of https://github.com/antos-rde/antos.git synced 2025-04-30 04:36:47 +02:00
Code Issues 6 Actions Packages Projects Releases Wiki Activity

fix(make): correct luasocket compiling
Some checks failed
gitea-sync/antos/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
DanyLE 2024-03-10 01:39:56 +01:00
parent 10aa6ab208
commit 7ce96d1c31
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -101,10 +101,14 @@ pipeline {
stages stages
{ {
stage('Prepare dependencies') { stage('Prepare dependencies') {
agent {
node { label'workstation' }
}
steps { steps {
sh''' sh'''
git submodule update --init git submodule update --init
make clean || true make clean || true
rm -rf build/* || true
''' '''
} }
} }

10
Makefile
View File

@ -57,13 +57,13 @@ luasocket:
make -C $(ROOT_DIR)/antd/luasocket linux make -C $(ROOT_DIR)/antd/luasocket linux
LUAV=5.4 \ LUAV=5.4 \
LUAINC_linux=$(ROOT_DIR)/antd/silk/modules/lua/lua54/ \ LUAINC_linux=$(ROOT_DIR)/antd/silk/modules/lua/lua54/ \
LUAPREFIX_linux=$(DESTDIR) \ LUAPREFIX_linux=$(BUILD_PREFIX) \
PLAT=linux \ PLAT=linux \
make -C $(ROOT_DIR)/antd/luasocket install-unix make -C $(ROOT_DIR)/antd/luasocket install-unix
-mkdir -p $(DESTDIR)/lib/lua -mkdir -p $(INSTALL_DIR)/lib/lua
cp -rf $(DESTDIR)/lib/lua/5.4/* $(DESTDIR)/opt/www/lib/lua/ cp -rf $(INSTALL_DIR)/lib/lua/5.4/* $(INSTALL_DIR)/lib/lua/
cp -rf $(DESTDIR)/share/lua/5.4/* $(DESTDIR)/opt/www/lib/lua/ cp -rf $(INSTALL_DIR)/share/lua/5.4/* $(INSTALL_DIR)/lib/lua/
rm -rf $(DESTDIR)/lib $(DESTDIR)/share rm -rf $(INSTALL_DIR)/lib/lua/5.4 $(INSTALL_DIR)/share
antd-% sil%: httpd antd-% sil%: httpd
@echo "Building $@" @echo "Building $@"