Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk.

Nico Huber would like Thomas Heijligen to review this change.

View Change

cmocka: Drop as meson subproject

Depend exclusive on the cmocka package provided by the build
environment. Cmocka is widely available in Linux distributions and BSD
systems. Besides that, it is suboptimal to fetch own dependencies in the
build process. Most packaging systems even forbid fetching additional
assets at build time.

Change-Id: I570b191af7a6403af9c9501d48b3e04988c3eb91
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
---
M meson.build
D subprojects/cmocka.wrap
M tests/meson.build
3 files changed, 19 insertions(+), 17 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/46/67346/1

diff --git a/meson.build b/meson.build
index 366ce18..3a60f92 100644
--- a/meson.build
+++ b/meson.build
@@ -500,11 +500,7 @@
 # `.allowed()` gets introduced in 0.59.0
 if get_option('tests').auto() or get_option('tests').enabled()
   # unit-test framework
-  cmocka_dep = dependency(
-    'cmocka',
-    fallback: ['cmocka', 'cmocka_dep'],
-    required : get_option('tests')
-  )
+  cmocka = dependency('cmocka', required : get_option('tests'))
 
   flashrom_test_dep = declare_dependency(
     include_directories : include_dir,
@@ -523,7 +519,7 @@
     ],
   )
 
-  if cmocka_dep.found()
+  if cmocka.found()
     subdir('tests')
   endif
 endif
diff --git a/subprojects/cmocka.wrap b/subprojects/cmocka.wrap
deleted file mode 100644
index 21e84f9..0000000
--- a/subprojects/cmocka.wrap
+++ /dev/null
@@ -1,10 +0,0 @@
-[wrap-file]
-directory = cmocka-1.1.5
-
-source_url = https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz
-source_filename = cmocka-1.1.5.tar.xz
-source_hash = f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/cmocka/1.1.5/3/get_zip
-patch_filename = cmocka-1.1.5-3-wrap.zip
-patch_hash = 81ce48613680d3c3a0b396ac570c852b290adcd18202fb16aaf703a9493f4348
diff --git a/tests/meson.build b/tests/meson.build
index 96ca5a6..c0e2392 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -112,6 +112,6 @@
   ],
   export_dynamic : true,
   link_args : mocks,
-  dependencies : [cmocka_dep, flashrom_test_dep],
+  dependencies : [cmocka, flashrom_test_dep],
 )
 test('cmocka test flashrom', flashrom_tests)

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