Commit 7d53040f authored by Romain Naour's avatar Romain Naour Committed by Thomas Petazzoni
Browse files

package/cpio: add argp-standalone dependency with musl 



Since argp-standalone is only available for uClibc-ng
and musl toolchains, add the dependendy only if it's
selected.

Signed-off-by: default avatarRomain Naour <romain.naour@openwide.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 6b47541e

package/cpio/Config.in

+1 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_CPIO

	bool "cpio"

	# Need argp.h support

	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC

	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL

	depends on BR2_USE_WCHAR

	help

	  cpio archive utility for creation and extraction.

package/cpio/cpio.mk

+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ CPIO_PATCH = \ 
	https://projects.archlinux.org/svntogit/packages.git/plain/cpio/trunk/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch \

	https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/cpio/files/cpio-2.11-stat.patch



# cpio uses argp.h which is not provided by uclibc by default.

# cpio uses argp.h which is not provided by uclibc or musl by default.

# Use the argp-standalone package to provide this but make sure

# the host package does not try to use the host version.

ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)

ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)

CPIO_DEPENDENCIES += argp-standalone

endif