From 9e3de3b53943501c0aa60f4f1f84802451519982 Mon Sep 17 00:00:00 2001 From: Nazir Bilal Yavuz Date: Fri, 19 Jul 2024 09:59:40 +0300 Subject: [PATCH v1 2/2] Remove PG_TEST_EXTRA from configure_scripts in .cirrus.tasks.yml Meson builds are able to get PG_TEST_EXTRA from environment now and this overrides the configure option. PG_TEST_EXTRA environment variable is set at the top of the .cirrus.tasks.yml file. So, PG_TEXT_EXTRA in configure scripts became useless and were removed because of that. --- .cirrus.tasks.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml index 99ca74d5133..8449addbdcf 100644 --- a/.cirrus.tasks.yml +++ b/.cirrus.tasks.yml @@ -174,7 +174,6 @@ task: --buildtype=debug \ -Dcassert=true -Dinjection_points=true \ -Duuid=bsd -Dtcl_version=tcl86 -Ddtrace=auto \ - -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ -Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \ build EOF @@ -362,7 +361,6 @@ task: --buildtype=debug \ -Dcassert=true -Dinjection_points=true \ ${LINUX_MESON_FEATURES} \ - -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ build EOF @@ -378,7 +376,6 @@ task: -Dllvm=disabled \ --pkg-config-path /usr/lib/i386-linux-gnu/pkgconfig/ \ -DPERL=perl5.36-i386-linux-gnu \ - -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ build-32 EOF @@ -492,7 +489,6 @@ task: -Dextra_lib_dirs=/opt/local/lib \ -Dcassert=true -Dinjection_points=true \ -Duuid=e2fs -Ddtrace=auto \ - -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \ build build_script: ninja -C build -j${BUILD_JOBS} @@ -564,7 +560,7 @@ task: # Use /DEBUG:FASTLINK to avoid high memory usage during linking configure_script: | vcvarsall x64 - meson setup --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=true -Dinjection_points=true -Db_pch=true -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% -DPG_TEST_EXTRA="%PG_TEST_EXTRA%" build + meson setup --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=true -Dinjection_points=true -Db_pch=true -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% build build_script: | vcvarsall x64 -- 2.45.2