NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit47caa71

committed

meson: Pass more feature option through to required kwargs

That was already done in a lot of places, but not all.Backpatch this to keep the the meson files aligned as long as reasonablypossible.Author: Tristan Partin <tristan@neon.tech>Reviewed-by: Andres Freund <andres@anarazel.de>Discussion:https://postgr.es/m/CSPIJVUDZFKX.3KHMOAVGF94RV@c3poBackpatch: 16-, where meson support was added

1 parent2eaa54d commit47caa71Copy full SHA for 47caa71

File tree

1 file changed

-8

lines changed

meson.build

1 file changed

-8

lines changed

`‎meson.build`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -773,8 +773,8 @@ endif`
`773`	`773`
`774`	`774`	`icuopt=get_option('icu')`
`775`	`775`	`ifnot icuopt.disabled()`
`776`		`- icu=dependency('icu-uc',required: icuopt.enabled())`
`777`		`- icu_i18n=dependency('icu-i18n',required: icuopt.enabled())`
	`776`	`+ icu=dependency('icu-uc',required: icuopt)`
	`777`	`+ icu_i18n=dependency('icu-i18n',required: icuopt)`
`778`	`778`
`779`	`779`	`if icu.found()`
`780`	`780`	`cdata.set('USE_ICU',1)`
`@@ -1058,9 +1058,9 @@ endif`
`1058`	`1058`	`pyopt=get_option('plpython')`
`1059`	`1059`	`ifnot pyopt.disabled()`
`1060`	`1060`	`pm=import('python')`
`1061`		`- python3_inst= pm.find_installation(required: pyopt.enabled())`
`1062`		`- python3_dep= python3_inst.dependency(embed:true,required: pyopt.enabled())`
`1063`		`-ifnot cc.check_header('Python.h',dependencies: python3_dep,required: pyopt.enabled())`
	`1061`	`+ python3_inst= pm.find_installation(required: pyopt)`
	`1062`	`+ python3_dep= python3_inst.dependency(embed:true,required: pyopt)`
	`1063`	`+ifnot cc.check_header('Python.h',dependencies: python3_dep,required: pyopt)`
`1064`	`1064`	`python3_dep= not_found_dep`
`1065`	`1065`	`endif`
`1066`	`1066`	`else`
`@@ -1083,7 +1083,7 @@ if not get_option('readline').disabled()`
`1083`	`1083`	`readline=dependency(readline_dep,required:false)`
`1084`	`1084`	`ifnot readline.found()`
`1085`	`1085`	`readline= cc.find_library(readline_dep,`
`1086`		`-required:get_option('readline').enabled(),`
	`1086`	`+required:get_option('readline'),`
`1087`	`1087`	`dirs: test_lib_d)`
`1088`	`1088`	`endif`
`1089`	`1089`	`if readline.found()`
`@@ -1382,7 +1382,7 @@ if not zlibopt.disabled()`
`1382`	`1382`	`warning('did not find zlib')`
`1383`	`1383`	`elifnot cc.has_header('zlib.h',`
`1384`	`1384`	`args: test_c_args,include_directories: postgres_inc,`
`1385`		`-dependencies: [zlib_t],required: zlibopt.enabled())`
	`1385`	`+dependencies: [zlib_t],required: zlibopt)`
`1386`	`1386`	`warning('zlib header not found')`
`1387`	`1387`	`elifnot cc.has_type('z_streamp',`
`1388`	`1388`	`dependencies: [zlib_t],prefix:'#include <zlib.h>',`
`@@ -2519,7 +2519,7 @@ if not nlsopt.disabled()`
`2519`	`2519`	`# otherwise there'd be lots of`
`2520`	`2520`	`# "Gettext not found, all translation (po) targets will be ignored."`
`2521`	`2521`	`# warnings if not found.`
`2522`		`- msgfmt=find_program('msgfmt',required: nlsopt.enabled(),native:true)`
	`2522`	`+ msgfmt=find_program('msgfmt',required: nlsopt,native:true)`
`2523`	`2523`
`2524`	`2524`	`# meson 0.59 has this wrapped in dependency('intl')`
`2525`	`2525`	`if (msgfmt.found()and`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit47caa71

File tree

1 file changed

1 file changed

`‎meson.build`

0 commit comments