Thomas Heijligen has uploaded this change for review.

View Change

meson: find libftdi1 also as libftdi with pkg-config

On some systems the libftdi1 is known only as libftdi. Extend the meson
dependency call so that it searches for libftdi1 and libftdi. Add a
minimum required version to not get the original libftdi, which was
version 0.2 at highest.

The update to meson >=0.60.0 is required to use multiple names for a
dependency.
https://mesonbuild.com/Reference-manual_functions.html#dependency

Change-Id: I48d72f06c6a43e27c7370207f111292fe2ba63f9
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
---
M meson.build
1 file changed, 21 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/63/73263/1
diff --git a/meson.build b/meson.build
index baa1084..1796a4e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('flashromutils', 'c',
version : run_command('util/getversion.sh', '--version', check : true).stdout().strip(),
license : 'GPL-2.0',
- meson_version : '>=0.53.0',
+ meson_version : '>=0.60.0',
default_options : [
'warning_level=2',
'c_std=c99',
@@ -126,7 +126,7 @@

libpci = dependency('libpci', required : group_pci, static : (host_machine.system() == 'openbsd' ? true : false)) # On openbsd a static version of libpci is needed to get also -libz
libusb1 = dependency('libusb-1.0', required : group_usb)
-libftdi1 = dependency('libftdi1', required : group_ftdi)
+libftdi1 = dependency('libftdi1', 'libftdi', version : '>=1.0', required : group_ftdi)
libjaylink = dependency('libjaylink', required : group_jlink)

subdir('platform')

To view, visit change 73263. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I48d72f06c6a43e27c7370207f111292fe2ba63f9
Gerrit-Change-Number: 73263
Gerrit-PatchSet: 1
Gerrit-Owner: Thomas Heijligen <src@posteo.de>
Gerrit-MessageType: newchange