Skip to contentSkip to conversation

package/samba4: add cmocka dependency

PATCH New Fabrice Fontaine 2 participants 2 messages May 10, 2019 – May 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/samba4: add cmocka dependency

Use system version of cmocka instead of the embedded one

---
 package/samba4/Config.in | 3 ++-
 package/samba4/samba4.mk | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
package/samba4/Config.in +2 -1
index 4ccd22aa2d..f65cdc47b6 100644
@@ -9,10 +9,11 @@ config BR2_PACKAGE_SAMBA4
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR # python
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi
-	depends on !BR2_STATIC_LIBS # python, gnutls
+	depends on !BR2_STATIC_LIBS # cmocka, python, gnutls
 	depends on !BR2_nios2 # binary too large, relocations don't fit
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_TOOLCHAIN_USES_MUSL
+	select BR2_PACKAGE_CMOCKA
 	select BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_PACKAGE_POPT
package/samba4/samba4.mk +1 -1
index 941d4df1d6..3ab255b8fe 100644
@@ -12,7 +12,7 @@ SAMBA4_LICENSE = GPL-3.0+
 SAMBA4_LICENSE_FILES = COPYING
 SAMBA4_DEPENDENCIES = \
 	host-e2fsprogs host-heimdal host-python host-nfs-utils \
-	e2fsprogs popt python zlib \
+	cmocka e2fsprogs popt python zlib \
 	$(if $(BR2_PACKAGE_LIBAIO),libaio) \
 	$(if $(BR2_PACKAGE_LIBCAP),libcap) \
 	$(if $(BR2_PACKAGE_READLINE),readline) \
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/samba4: add cmocka dependency

Quoted 7 lines · On Sat, 11 May 2019 00:20:29 +0200 Fabrice Fontaine…

Use system version of cmocka instead of the embedded one

---
 package/samba4/Config.in | 3 ++-
 package/samba4/samba4.mk | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com