Unverified Commit 145df399 authored by Marcus Tomlinson's avatar Marcus Tomlinson Committed by GitHub

Explicitly find and link blkid using pkg-config (#62979)

parent 2939c209
...@@ -56,6 +56,7 @@ class LinuxDoctorValidator extends DoctorValidator { ...@@ -56,6 +56,7 @@ class LinuxDoctorValidator extends DoctorValidator {
'gtk+-3.0', 'gtk+-3.0',
'glib-2.0', 'glib-2.0',
'gio-2.0', 'gio-2.0',
'blkid',
]; ];
@override @override
......
...@@ -24,6 +24,7 @@ find_package(PkgConfig REQUIRED) ...@@ -24,6 +24,7 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid)
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
...@@ -65,6 +66,7 @@ target_link_libraries(flutter INTERFACE ...@@ -65,6 +66,7 @@ target_link_libraries(flutter INTERFACE
PkgConfig::GTK PkgConfig::GTK
PkgConfig::GLIB PkgConfig::GLIB
PkgConfig::GIO PkgConfig::GIO
PkgConfig::BLKID
) )
add_dependencies(flutter flutter_assemble) add_dependencies(flutter flutter_assemble)
......
...@@ -61,6 +61,7 @@ List<FakeCommand> _librariesPresentCommands() { ...@@ -61,6 +61,7 @@ List<FakeCommand> _librariesPresentCommands() {
FakeCommand(command: <String>['pkg-config', '--exists', 'gtk+-3.0']), FakeCommand(command: <String>['pkg-config', '--exists', 'gtk+-3.0']),
FakeCommand(command: <String>['pkg-config', '--exists', 'glib-2.0']), FakeCommand(command: <String>['pkg-config', '--exists', 'glib-2.0']),
FakeCommand(command: <String>['pkg-config', '--exists', 'gio-2.0']), FakeCommand(command: <String>['pkg-config', '--exists', 'gio-2.0']),
FakeCommand(command: <String>['pkg-config', '--exists', 'blkid']),
]; ];
} }
...@@ -73,6 +74,7 @@ List<FakeCommand> _librariesMissingCommands() { ...@@ -73,6 +74,7 @@ List<FakeCommand> _librariesMissingCommands() {
exitCode: 1, exitCode: 1,
), ),
FakeCommand(command: <String>['pkg-config', '--exists', 'gio-2.0']), FakeCommand(command: <String>['pkg-config', '--exists', 'gio-2.0']),
FakeCommand(command: <String>['pkg-config', '--exists', 'blkid']),
]; ];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment