Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix out of sources tree build #5239

Merged
merged 2 commits into from
Jan 24, 2024
Merged

Fix out of sources tree build #5239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7c56d9
Fix out of sources tree build
remicollet Jan 24, 2024
7df66e1
check in CI is extension can be loaded
remicollet Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,14 +1009,19 @@ EOF
AC_DEFINE(SW_USE_MYSQLND, 1, [use mysqlnd])
fi

if test -f "ext-src/php_swoole.cc"; then
AC_MSG_CHECKING([for sources])
if test -f "$abs_srcdir/ext-src/php_swoole.cc"; then
swoole_source_dir=$abs_srcdir
elif test -f "ext-src/php_swoole.cc"; then
swoole_source_dir=$(pwd)
else
swoole_source_dir="ext/swoole"
fi
AC_MSG_RESULT([$swoole_source_dir])

ext_src_files=$(cd $swoole_source_dir && find ext-src/ -name *.cc)
lib_src_files=$(cd $swoole_source_dir && find src/ -name *.cc)

swoole_source_file="${ext_src_files} ${lib_src_files}"

swoole_source_file="$swoole_source_file \
Expand Down
1 change: 1 addition & 0 deletions scripts/pecl-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ pecl config-show && \
php tools/pecl-package.php && package_file="`ls | grep swoole-*tgz`" && \
echo "\n" | pecl install -f ${package_file} | tee pecl.log && \
cat pecl.log | grep "successfully" && \
php -d extension=swoole --ri swoole && \
pecl uninstall swoole && \
rm -f pecl.log
Loading