Skip to content
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

Jump to bottom

generic linux package #1504

Merged
merged 2 commits into from
May 12, 2024
Merged

generic linux package #1504

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
1f0fe6d
generic linux package
pazos May 6, 2024
e5314d9
fix permissions for turbo lua files
pazos May 7, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include Makefile.defs
.NOTPARALLEL:

DO_STRIP := $(if $(or $(EMULATE_READER),$(KODEBUG)),,1)
DO_STRIP := $(if $(or $(DO_STRIP),$(APPIMAGE),$(DEBIAN)),1,)
DO_STRIP := $(if $(or $(DO_STRIP),$(APPIMAGE),$(LINUX)),1,)

$(info ************ Building for MACHINE: "$(MACHINE)" **********)
$(info ************ PATH: "$(PATH)" **********)
Expand Down
43 changes: 19 additions & 24 deletions Makefile.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ else
export NDKABI?=18
endif

LINUX_ARCH?=native

# Detect LuaRocks 3
LR_VER_NUM := $(shell luarocks --version | grep -Eo '[0-9]+.[0-9]+')
LR_GT_3_0 := $(shell awk -v LR_VER_NUM=$(LR_VER_NUM) 'BEGIN { print (LR_VER_NUM >= 3.0); }')
Expand Down Expand Up @@ -165,22 +167,16 @@ else ifeq ($(TARGET), appimage)
export EMULATE_READER=1
export SDL=1
export APPIMAGE=1
else ifeq ($(TARGET), debian)
export SDL=1
export DEBIAN=1
export EMULATE_READER=1
else ifeq ($(TARGET), debian-armel)
CHOST?=arm-linux-gnueabi
else ifeq ($(TARGET), linux)
export SDL=1
export DEBIAN_CROSS=1
else ifeq ($(TARGET), debian-armhf)
CHOST?=arm-linux-gnueabihf
export SDL=1
export DEBIAN_CROSS=1
else ifeq ($(TARGET), debian-arm64)
CHOST?=aarch64-linux-gnu
export SDL=1
export DEBIAN_CROSS=1
ifeq ($(LINUX_ARCH), arm)
CHOST?=arm-linux-gnueabihf
else ifeq ($(LINUX_ARCH), arm64)
CHOST?=aarch64-linux-gnu
else
LINUX=1
export EMULATE_READER=1
Frenzie marked this conversation as resolved.
Show resolved Hide resolved
endif
else ifeq ($(TARGET), macos)
export SDL=1
export MACOS=1
Expand Down Expand Up @@ -524,14 +520,13 @@ else ifeq ($(TARGET), arm-generic)
# Defaults to generic crap
ARM_ARCH:=$(ARMV6_GENERIC_ARCH)
ARM_ARCH+=-mfloat-abi=softfp
else ifeq ($(TARGET), debian-armel)
ARM_ARCH:=$(ARMV7_GENERIC_ARCH)
ARM_ARCH+=-mfloat-abi=softfp
else ifeq ($(TARGET), debian-armhf)
ARM_ARCH:=$(ARMV7_GENERIC_ARCH)
ARM_ARCH+=-mfloat-abi=hard
else ifeq ($(TARGET), debian-arm64)
ARM_ARCH:=$(ARM64_GENERIC_ARCH)
else ifeq ($(TARGET), linux)
ifeq ($(LINUX_ARCH), arm)
ARM_ARCH:=$(ARMV7_GENERIC_ARCH)
ARM_ARCH+=-mfloat-abi=hard
else ifeq ($(LINUX_ARCH), arm64)
ARM_ARCH:=$(ARM64_GENERIC_ARCH)
endif
else
# else, we are compiling emulator on x86
ARM_ARCH:=
Expand All @@ -543,7 +538,7 @@ ifdef APPIMAGE
HOST_ARCH:=-mtune=generic -march=x86-64
endif

ifdef DEBIAN
ifdef LINUX
pazos marked this conversation as resolved.
Show resolved Hide resolved
HOST_ARCH:=-mtune=generic
endif

Expand Down
3 changes: 3 additions & 0 deletions thirdparty/turbo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ assert_var_defined(LDFLAGS)

ep_get_source_dir(SOURCE_DIR)

# Some of the LUA files are executables for no good reason.
list(APPEND PATCH_CMD COMMAND chmod a-x turbo/platform.lua turbo/socket_ffi.lua turbo/syscall.lua)

set(BUILD_CMD ${KO_MAKE_RECURSIVE} "CC=${CC}" "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" all)

# Drop duplicate cdefs, make sure turbo find its libtffi_wrap library, and pull in upstream fixes
Expand Down