Template
1
0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-13 22:03:09 +00:00

update builder-linux

This commit is contained in:
bol-van
2026-02-28 22:23:13 +03:00
parent 3e52d53df0
commit 318c625247
3 changed files with 12 additions and 9 deletions

View File

@@ -61,10 +61,12 @@ build_lua()
}
build_luajit()
{
local CFL="$CFLAGS"
(
cd luajit2-*
CFLAGS="-Os"
make clean
make BUILDMODE=static CFLAGS="-O2" XCFLAGS="-DLUAJIT_DISABLE_FFI $CFLAGS_PIC" HOST_CC="$HOST_CC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$OPTIMIZE $MINSIZE $CFLAGS" TARGET_LDFLAGS="$CPU $LDMINSIZE $LDFLAGS"
make BUILDMODE=static XCFLAGS="-DLUAJIT_DISABLE_FFI $CFLAGS_PIC" HOST_CC="$HOST_CC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$OPTIMIZE $MINSIZE $CFL" TARGET_LDFLAGS="$CPU $LDMINSIZE $LDFLAGS"
make install PREFIX= DESTDIR="$STAGING_DIR"
)
}
@@ -91,8 +93,9 @@ ask_target
CFLAGS_BASE="$CFLAGS"
for t in $TGT; do
CFLAGS="$CFLAGS_BASE $CFLAGS_PIC"
CFLAGS="$CFLAGS_BASE"
buildenv $t
CFLAGS="$CFLAGS $CFLAGS_PIC"
pushd "$DEPS"
install_h_files
build_netlink

View File

@@ -38,7 +38,7 @@ ask_target
CFLAGS_BASE="$CFLAGS"
for t in $TGT; do
CFLAGS="$CFLAGS_BASE $MINSIZE $CFLAGS_PIC"
CFLAGS="$CFLAGS_BASE $MINSIZE"
buildenv $t
translate_target $t || {
@@ -50,7 +50,7 @@ for t in $TGT; do
make clean
OPTIMIZE=$OPTIMIZE \
CFLAGS="-static-libgcc -I$STAGING_DIR/include $CFLAGS" \
CFLAGS="-static-libgcc -I$STAGING_DIR/include $CFLAGS $CFLAGS_PIC" \
LDFLAGS="-L$STAGING_DIR/lib $LDMINSIZE $LDFLAGS_PIE $LDFLAGS" \
make

View File

@@ -23,7 +23,7 @@ nproc=$(nproc)
TARGETS="\
aarch64-unknown-linux-musl \
arm-unknown-linux-musleabi \
armv7-unknown-linux-musleabi \
i586-unknown-linux-musl \
x86_64-unknown-linux-musl \
mips-unknown-linux-muslsf \
@@ -38,7 +38,7 @@ target_has_luajit()
{
case "$1" in
aarch64-unknown-linux-musl| \
arm-unknown-linux-musleabi| \
armv7-unknown-linux-musleabi| \
x86_64-unknown-linux-musl| \
mips-unknown-linux-muslsf| \
mips64-unknown-linux-musl| \
@@ -100,8 +100,8 @@ buildenv()
# not all archs support -static-pie. if does not support - it produces dynamic executable
# "-static -static-pie" causes segfaults
case $1 in
arm-*)
CPU="-mcpu=cortex-a7 -mthumb -msoft-float $CFLAGS"
armv7-*)
CPU="-mcpu=cortex-a7 -mthumb -msoft-float"
CFLAGS="$CPU $CFLAGS"
;;
mips*)
@@ -273,7 +273,7 @@ translate_target()
aarch64-unknown-linux-musl)
ZBINTARGET=linux-arm64
;;
arm-unknown-linux-musleabi)
armv7-unknown-linux-musleabi)
ZBINTARGET=linux-arm
;;
x86_64-unknown-linux-musl)