Skip to content

Commit 2cce02b

Browse files
committed
liblz4 replacement
1 parent 7e35de8 commit 2cce02b

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

config/env.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ CC=${SPC_LINUX_DEFAULT_CC}
7070
CXX=${SPC_LINUX_DEFAULT_CXX}
7171
AR=${SPC_LINUX_DEFAULT_AR}
7272
LD=${SPC_LINUX_DEFAULT_LD}
73+
DISABLED_WARNINGS="-Wno-error -Wno-date-time -Wno-int-conversion -Wno-implicit-function-declaration"
7374
; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
74-
SPC_DEFAULT_C_FLAGS="-fPIC -Os"
75-
SPC_DEFAULT_CXX_FLAGS="-fPIC -Os"
75+
SPC_DEFAULT_C_FLAGS="-fPIC -Os -Wno-error -Wno-date-time -Wno-int-conversion -Wno-implicit-function-declaration"
76+
SPC_DEFAULT_CXX_FLAGS="-fPIC -Os -Wno-error -Wno-date-time -Wno-int-conversion -Wno-implicit-function-declaration"
7677
; extra libs for building php executable, used in `make` command for building php (this value may changed by extension build process, space separated)
7778
SPC_EXTRA_LIBS=
7879
; upx executable path
@@ -100,7 +101,7 @@ SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
100101
; LIBS for configuring php
101102
SPC_CMD_VAR_PHP_CONFIGURE_LIBS="-ldl -lpthread -lm"
102103
; EXTRA_CFLAGS for `make` php
103-
SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE ${SPC_DEFAULT_C_FLAGS}"
104+
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"
104105
; EXTRA_LIBS for `make` php
105106
SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm"
106107
; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so

src/SPC/builder/unix/library/liblz4.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ protected function build(): void
1919
{
2020
shell()->cd($this->source_dir)->initializeEnv($this)
2121
->exec("make PREFIX='' clean")
22-
->exec("make lib -j{$this->builder->concurrency} PREFIX=''")
23-
->exec("sed -i 's/^\\$(MAKE) -C \\$(PRGDIR) \\$@/#\\$(MAKE) -C \\$(PRGDIR) \\$@/' Makefile")
22+
->exec("make lib -j{$this->builder->concurrency} PREFIX=''");
23+
24+
FileSystem::replaceFileStr($this->source_dir . '/Makefile', '$(MAKE) -C \$(PRGDIR)', '');
25+
26+
shell()->cd($this->source_dir)
2427
->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH);
2528

2629
$this->patchPkgconfPrefix(['liblz4.pc']);

0 commit comments

Comments
 (0)