Commit9ca6e7b

committed

meson: Make gzip and tar optional

They are only used for some tests. The tests are already set to skipas appropriate if they are not available.Discussion:https://www.postgresql.org/message-id/flat/ZQzp_VMJcerM1Cs_%40paquier.xyz

1 parent9aa374d commit9ca6e7bCopy full SHA for 9ca6e7b

File tree

-9

lines changed

-9

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ tests += {`
`24`	`24`	`'tests': [`
`25`	`25`	`'t/001_basic.pl',`
`26`	`26`	`],`
`27`		`-'env': {'GZIP_PROGRAM': gzip.path(),`
`28`		`-'TAR': tar.path()},`
	`27`	`+'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() :'',`
	`28`	`+'TAR': tar.found() ? tar.path() :''},`
`29`	`29`	`},`
`30`	`30`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -333,8 +333,8 @@ flex = find_program(get_option('FLEX'), native: true, version: '>= 2.5.35')`
`333`	`333`	`bison=find_program(get_option('BISON'),native:true,version:'>= 2.3')`
`334`	`334`	`sed=find_program(get_option('SED'),'sed',native:true,required:false)`
`335`	`335`	`prove=find_program(get_option('PROVE'),native:true,required:false)`
`336`		`-tar=find_program(get_option('TAR'),native:true)`
`337`		`-gzip=find_program(get_option('GZIP'),native:true)`
	`336`	`+tar=find_program(get_option('TAR'),native:true,required:false)`
	`337`	`+gzip=find_program(get_option('GZIP'),native:true,required:false)`
`338`	`338`	`program_lz4=find_program(get_option('LZ4'),native:true,required:false)`
`339`	`339`	`openssl=find_program(get_option('OPENSSL'),native:true,required:false)`
`340`	`340`	`program_zstd=find_program(get_option('ZSTD'),native:true,required:false)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ tests += {`
`80`	`80`	`'sd':meson.current_source_dir(),`
`81`	`81`	`'bd':meson.current_build_dir(),`
`82`	`82`	`'tap': {`
`83`		`-'env': {'GZIP_PROGRAM': gzip.path(),`
`84`		`-'TAR': tar.path(),`
	`83`	`+'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() :'',`
	`84`	`+'TAR': tar.found() ? tar.path() :'',`
`85`	`85`	`'LZ4': program_lz4.found() ? program_lz4.path() :'',`
`86`	`86`	`},`
`87`	`87`	`'tests': [`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ tests += {`
`90`	`90`	`'bd':meson.current_build_dir(),`
`91`	`91`	`'tap': {`
`92`	`92`	`'env': {`
`93`		`-'GZIP_PROGRAM': gzip.path(),`
	`93`	`+'GZIP_PROGRAM': gzip.found() ? gzip.path() :'',`
`94`	`94`	`'LZ4': program_lz4.found() ? program_lz4.path() :'',`
`95`	`95`	`'ZSTD': program_zstd.found() ? program_zstd.path() :'',`
`96`	`96`	`'with_icu': icu.found() ?'yes' :'no',`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ tests += {`
`22`	`22`	`'sd':meson.current_source_dir(),`
`23`	`23`	`'bd':meson.current_build_dir(),`
`24`	`24`	`'tap': {`
`25`		`-'env': {'GZIP_PROGRAM': gzip.path(),`
`26`		`-'TAR': tar.path(),`
	`25`	`+'env': {'GZIP_PROGRAM': gzip.found() ? gzip.path() :'',`
	`26`	`+'TAR': tar.found() ? tar.path() :'',`
`27`	`27`	`'LZ4': program_lz4.found() ? program_lz4.path() :'',`
`28`	`28`	`'ZSTD': program_zstd.found() ? program_zstd.path() :''},`
`29`	`29`	`'tests': [`

Comments

(0)