diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-12-20 22:37:33 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-12-21 14:48:30 +0000 |
| commit | 992b03a38308d77db52f6a2a0f2b40c6fa08e305 (patch) | |
| tree | e2653cd0bb593b64ae1315af327406a9c62fbe8f /config/coreboot/default/patches | |
| parent | e7628421d7ef07d02f8d074f53e3a00cea465012 (diff) | |
coreboot/default: use 3rdparty/cmocka by default
this is used by the coreboot build system, for tests.
upstream tries system cmocka by default, but we want the
one in 3rdparty to be used.
i've changed the default to 0 (try 3rdparty cmocka). you
can still override this at runtime.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'config/coreboot/default/patches')
| -rw-r--r-- | config/coreboot/default/patches/0044-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/config/coreboot/default/patches/0044-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch b/config/coreboot/default/patches/0044-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch new file mode 100644 index 00000000..afa6017b --- /dev/null +++ b/config/coreboot/default/patches/0044-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch @@ -0,0 +1,30 @@ +From ca27517cb5752d078a3f8328ff6b220f652b0849 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Sat, 20 Dec 2025 22:36:18 +0100 +Subject: [PATCH 1/1] tests/Makefile.mk: use 3rdparty/cmocka by default + +(tests) + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + tests/Makefile.mk | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/Makefile.mk b/tests/Makefile.mk +index f3f122dd38..33bb2a2d07 100644 +--- a/tests/Makefile.mk ++++ b/tests/Makefile.mk +@@ -25,7 +25,9 @@ TEST_LDFLAGS += --coverage + endif + + # Use system cmoka in default, or build from 3rdparty source code if requested +-USE_SYSTEM_CMOCKA ?= 1 ++# PATCH NOTE: lbmk sets it to 0 by default. You can still override it to 1 ++# if you wish; upstream sets this to 1 by default, but we do 0 ++USE_SYSTEM_CMOCKA ?= 0 + ifeq ($(USE_SYSTEM_CMOCKA),1) + ifeq ($(shell $(HOSTPKG_CONFIG) --exists cmocka || echo 1),1) + $(warning No system cmocka, build from 3rdparty instead...) +-- +2.47.3 + |