gandc/zapret2
Template
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-14 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

update builder-linux

Browse Source
This commit is contained in:
bol-van
2026-02-26 18:41:36 +03:00
parent 7584d5e38f
commit 60988755b7
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/compile/builder-linux/build_deps.sh
View File

@@ -64,7 +64,7 @@ build_luajit()
( (
cd luajit2-* cd luajit2-*
make clean make clean
make BUILDMODE=static XCFLAGS=-DLUAJIT_DISABLE_FFI HOST_CC="$HOSTCC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$OPTIMIZE $MINSIZE $CFLAGS" TARGET_LDFLAGS="$LDMINSIZE $LDFLAGS" make BUILDMODE=static XCFLAGS="-DLUAJIT_DISABLE_FFI $CFLAGS_PIC" HOST_CC="$HOSTCC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$OPTIMIZE $MINSIZE $CFLAGS" TARGET_LDFLAGS="$LDMINSIZE $LDFLAGS"
make install PREFIX= DESTDIR="$STAGING_DIR" make install PREFIX= DESTDIR="$STAGING_DIR"
) )
} }
@@ -89,6 +89,7 @@ dl_deps
check_toolchains check_toolchains
ask_target ask_target
CFLAGS="$CFLAGS $CFLAGS_PIC"
for t in $TGT; do for t in $TGT; do
buildenv $t buildenv $t
pushd "$DEPS" pushd "$DEPS"

4
docs/compile/builder-linux/build_zapret1.sh
View File

@@ -48,8 +48,8 @@ for t in $TGT; do
make clean make clean
OPTIMIZE=$OPTIMIZE \ OPTIMIZE=$OPTIMIZE \
CFLAGS="-static-libgcc -static -I$STAGING_DIR/include $MINSIZE $CFLAGS" \ CFLAGS="-static-libgcc -I$STAGING_DIR/include $MINSIZE $CFLAGS_PIC $CFLAGS" \
LDFLAGS="-L$STAGING_DIR/lib $LDMINSIZE $LDFLAGS" \ LDFLAGS="-L$STAGING_DIR/lib $LDMINSIZE $LDFLAGS_PIE $LDFLAGS" \
make make
[ -d "$ZBIN/$ZBINTARGET" ] || mkdir "$ZBIN/$ZBINTARGET" [ -d "$ZBIN/$ZBINTARGET" ] || mkdir "$ZBIN/$ZBINTARGET"

4
docs/compile/builder-linux/build_zapret2.sh
View File

@@ -59,9 +59,9 @@ for t in $TGT; do
LUA_JIT=$LUA_JIT LUA_VER=$LUA_VER LUAJIT_LUA_VER=$LUAJIT_LUA_VER \ LUA_JIT=$LUA_JIT LUA_VER=$LUA_VER LUAJIT_LUA_VER=$LUAJIT_LUA_VER \
OPTIMIZE=$OPTIMIZE \ OPTIMIZE=$OPTIMIZE \
MINSIZE=$MINSIZE \ MINSIZE=$MINSIZE \
CFLAGS="-static-libgcc -static -I$STAGING_DIR/include $CFLAGS" \ CFLAGS="-static-libgcc -I$STAGING_DIR/include $CFLAGS" \
LDFLAGS="-L$STAGING_DIR/lib $LDFLAGS" \ LDFLAGS="-L$STAGING_DIR/lib $LDFLAGS" \
make LUA_JIT=$LJIT LUA_CFLAGS="$LCFLAGS" LUA_LIB="$LLIB" make CFLAGS_PIC=$CFLAGS_PIC LDFLAGS_PIE=$LDFLAGS_PIE LUA_JIT=$LJIT LUA_CFLAGS="$LCFLAGS" LUA_LIB="$LLIB"
[ -d "$ZBIN/$ZBINTARGET" ] || mkdir "$ZBIN/$ZBINTARGET" [ -d "$ZBIN/$ZBINTARGET" ] || mkdir "$ZBIN/$ZBINTARGET"
cp -f binaries/my/* "$ZBIN/$ZBINTARGET" cp -f binaries/my/* "$ZBIN/$ZBINTARGET"

9
docs/compile/builder-linux/common.inc
View File

@@ -9,6 +9,8 @@ MINSIZE="${MINSIZE:--flto=auto -ffunction-sections -fdata-sections}"
LDMINSIZE="${LDMINSIZE:--Wl,--gc-sections -flto=auto}" LDMINSIZE="${LDMINSIZE:--Wl,--gc-sections -flto=auto}"
#CFLAGS="" #CFLAGS=""
LDFLAGS="-lgcc_eh $LDFLAGS" LDFLAGS="-lgcc_eh $LDFLAGS"
# PIE makes ASLR working but adds 5% to size
PIE=${PIE:-0}
HOSTCC=${HOSTCC:-cc} HOSTCC=${HOSTCC:-cc}
LUA_VER=${LUA_VER:-5.5} LUA_VER=${LUA_VER:-5.5}
LUA_RELEASE=${LUA_RELEASE:-5.5.0} LUA_RELEASE=${LUA_RELEASE:-5.5.0}
@@ -17,6 +19,13 @@ LUAJIT_RELEASE=${LUAJIT_RELEASE:-2.1-20250826}
LUAJIT_LUA_VER=${LUAJIT_LUA_VER:-5.1} LUAJIT_LUA_VER=${LUAJIT_LUA_VER:-5.1}
nproc=$(nproc) nproc=$(nproc)
CFLAGS_PIC=
LDFLAGS_PIE=-static
[ "$PIE" = 1 ] && {
CFLAGS_PIC=-fPIC
LDFLAGS_PIE=-static-pie
}
TARGETS="\ TARGETS="\
aarch64-unknown-linux-musl \ aarch64-unknown-linux-musl \
arm-unknown-linux-musleabi \ arm-unknown-linux-musleabi \