diff --git a/config/env.ini b/config/env.ini index d80bc3e7..cebc39d8 100644 --- a/config/env.ini +++ b/config/env.ini @@ -71,7 +71,7 @@ CXX=${SPC_LINUX_DEFAULT_CXX} AR=${SPC_LINUX_DEFAULT_AR} LD=${SPC_LINUX_DEFAULT_LD} ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build -SPC_DEFAULT_C_FLAGS="-fPIC -Os" +SPC_DEFAULT_C_FLAGS="-fPIC -Os -Wno-error=date-time" SPC_DEFAULT_CXX_FLAGS="-fPIC -Os" ; 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= diff --git a/src/SPC/builder/extension/amqp.php b/src/SPC/builder/extension/amqp.php index 7e0ea2de..3a9d2ae2 100644 --- a/src/SPC/builder/extension/amqp.php +++ b/src/SPC/builder/extension/amqp.php @@ -25,7 +25,7 @@ class amqp extends Extension public function getUnixConfigureArg(bool $shared = false): string { - return '--with-amqp' . ($shared ? '=shared' : '') . ' --with-librabbitmq-dir=' . BUILD_ROOT_PATH; + return '--with-amqp' . ($sh PKG_ROOT_PATH . '/go', 'CGO_ENABLED' => '1', 'CGO_CFLAGS' => $config['cflags'], - 'CGO_LDFLAGS' => "{$config['ldflags']} {$config['libs']} {$lrt}", + 'CGO_LDFLAGS' => "{$config['ldflags']} {$config['libs']} {$lrt} -L/usr/lib64", 'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' . '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' . $debugFlags . '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' . diff --git a/src/SPC/builder/unix/library/librdkafka.php b/src/SPC/builder/unix/library/librdkafka.php index 32f389e1..9ba10e05 100644 --- a/src/SPC/builder/unix/library/librdkafka.php +++ b/src/SPC/builder/unix/library/librdkafka.php @@ -6,6 +6,7 @@ namespace SPC\builder\unix\library; use SPC\exception\FileSystemException; use SPC\exception\RuntimeException; +use SPC\store\FileSystem; use SPC\util\executor\UnixAutoconfExecutor; trait librdkafka @@ -16,6 +17,7 @@ trait librdkafka */ protected function build(): void { + FileSystem::replaceFileStr($this->source_dir . '/lds-gen.py', "funcs.append('rd_ut_coverage_check')", ''); UnixAutoconfExecutor::create($this) ->optionalLib( 'zstd', diff --git a/src/SPC/util/SPCConfigUtil.php b/src/SPC/util/SPCConfigUtil.php index 8e69e89c..ee13c4e9 100644 --- a/src/SPC/util/SPCConfigUtil.php +++ b/src/SPC/util/SPCConfigUtil.php @@ -147,7 +147,7 @@ class SPCConfigUtil } // patch: imagick (imagemagick wrapper) for linux needs libgomp if (in_array('imagemagick', $libraries) && PHP_OS_FAMILY === 'Linux' && !(getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10'))) { - $short_name[] = '-lgomp'; + $short_name[] = '-lomp'; } return implode(' ', $short_name); }