From 2cce02bfa99a0af36388126aa879b179115a9434 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Sun, 22 Jun 2025 17:01:08 +0700 Subject: [PATCH] liblz4 replacement --- config/env.ini | 7 ++++--- src/SPC/builder/unix/library/liblz4.php | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/config/env.ini b/config/env.ini index d80bc3e7..1d3931e8 100644 --- a/config/env.ini +++ b/config/env.ini @@ -70,9 +70,10 @@ CC=${SPC_LINUX_DEFAULT_CC} CXX=${SPC_LINUX_DEFAULT_CXX} AR=${SPC_LINUX_DEFAULT_AR} LD=${SPC_LINUX_DEFAULT_LD} +DISABLED_WARNINGS="-Wno-error -Wno-date-time -Wno-int-conversion -Wno-implicit-function-declaration" ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build -SPC_DEFAULT_C_FLAGS="-fPIC -Os" -SPC_DEFAULT_CXX_FLAGS="-fPIC -Os" +SPC_DEFAULT_C_FLAGS="-fPIC -Os -Wno-error -Wno-date-time -Wno-int-conversion -Wno-implicit-function-declaration" +SPC_DEFAULT_CXX_FLAGS="-fPIC -Os -Wno-error -Wno-date-time -Wno-int-conversion -Wno-implicit-function-declaration" ; extra libs for building php executable, used in `make` command for building php (this value may changed by extension build process, space separated) SPC_EXTRA_LIBS= ; upx executable path @@ -100,7 +101,7 @@ SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}" ; LIBS for configuring php SPC_CMD_VAR_PHP_CONFIGURE_LIBS="-ldl -lpthread -lm" ; EXTRA_CFLAGS for `make` php -SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE ${SPC_DEFAULT_C_FLAGS}" +SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE ${SPC_DEFAULT_C_FLAGS} -Wno-error -Wno-date-time -Wno-int-conversion -Wno-implicit-function-declaration" ; EXTRA_LIBS for `make` php SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm" ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so diff --git a/src/SPC/builder/unix/library/liblz4.php b/src/SPC/builder/unix/library/liblz4.php index b5970f74..757cc4be 100644 --- a/src/SPC/builder/unix/library/liblz4.php +++ b/src/SPC/builder/unix/library/liblz4.php @@ -19,8 +19,11 @@ trait liblz4 { shell()->cd($this->source_dir)->initializeEnv($this) ->exec("make PREFIX='' clean") - ->exec("make lib -j{$this->builder->concurrency} PREFIX=''") - ->exec("sed -i 's/^\\$(MAKE) -C \\$(PRGDIR) \\$@/#\\$(MAKE) -C \\$(PRGDIR) \\$@/' Makefile") + ->exec("make lib -j{$this->builder->concurrency} PREFIX=''"); + + FileSystem::replaceFileStr($this->source_dir . '/Makefile', '$(MAKE) -C \$(PRGDIR)', ''); + + shell()->cd($this->source_dir) ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH); $this->patchPkgconfPrefix(['liblz4.pc']);