postgres.git / summary / log / commit / refs

commit    585df02b445f63167f145685e045e5b6074a5a30
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Thu Apr 04 09:22:07 2024 +0000
First released in: 17.0

    Silence meson warning
    
    Commit 619bc23a1a introduced
    
        WARNING: Project targets '>=0.54' but uses feature introduced in '0.55.0': Passing executable/found program object to script parameter of add_dist_script
    
    Work around that by wrapping the offending line in a meson version check.
    
    Author: Tristan Partin <tristan@neon.tech>
    Discussion: https://www.postgresql.org/message-id/flat/D096Q3NFFVH1.1T5RE4MOO9ZFH%40neon.tech


 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 18b5be842e3..87437960bc3 100644
--- a/meson.build
+++ b/meson.build
@@ -3419,7 +3419,10 @@ alias_target('pgdist', [tar_gz, tar_bz2])
 # But not if we are in a subproject, in case the parent project wants to
 # create a dist using the standard Meson command.
 if not meson.is_subproject()
-  meson.add_dist_script(perl, '-e', 'exit 1')
+  # We can only pass the identifier perl here when we depend on >= 0.55
+  if meson.version().version_compare('>=0.55')
+    meson.add_dist_script(perl, '-e', 'exit 1')
+  endif
 endif
 
 


[parent: dd24098cd6fd]