walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

meson: fix regression that made it impossible to build 

In commit aa4909766c an option was
modified and changed its type from a list of possible strings to a
true/false value.

However, the build wasn't updated to correspond to that change, so it
didn't logically work -- and Meson even threw a type error saying you
cannot compare strings to booleans.

The actual change was basically "do not use this option anymore except
to pass a macro to the source file and embed the data at all". So we can
simply get rid of a bunch of complex dependency conditionals.

Fixes #185
This commit is contained in:
Eli Schwartz 2022-07-25 23:23:26 -04:00 committed by Tim Rühsen
parent a7b63cbb35
commit b9503b64c3
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meson.build
View File

@ -34,10 +34,7 @@ if ['libidn2', 'auto'].contains(enable_runtime)
if enable_runtime == 'auto'
enable_runtime = 'libidn2'
endif
if enable_builtin == 'auto'
enable_builtin = 'libidn2'
endif
elif [enable_runtime, enable_builtin].contains('libidn2')
elif enable_runtime == 'libidn2'
error('You requested libidn2 but it is not installed.')
endif
endif
@ -58,15 +55,12 @@ if ['libicu', 'auto'].contains(enable_runtime)
if enable_runtime == 'auto'
enable_runtime = 'libicu'
endif
if enable_builtin == 'auto'
enable_builtin = 'libicu'
endif
if add_languages('cpp', native : false)
link_language = 'cpp'
else
error('C++ compiler is not available')
endif
elif [enable_runtime, enable_builtin].contains('libicu')
elif enable_runtime == 'libicu'
error('You requested libicu but it is not installed.')
endif
endif
@ -80,10 +74,7 @@ if ['libidn', 'auto'].contains(enable_runtime)
if enable_runtime == 'auto'
enable_runtime = 'libidn'
endif
if enable_builtin == 'auto'
enable_builtin = 'libidn'
endif
elif [enable_runtime, enable_builtin].contains('libidn')
elif enable_runtime == 'libidn'
error('You requested libidn but it is not installed.')
endif
endif
@ -101,9 +92,6 @@ endif
if enable_runtime == 'auto'
enable_runtime = 'no'
endif
if enable_builtin == 'auto'
enable_builtin = 'no'
endif
config = configuration_data()
config.set_quoted('PACKAGE_VERSION', meson.project_version())