[LEDE-DEV] [PATCH] uhttpd: fix PKG_BUILD_DEPENDS

[Matthias Schiffer]

On 06/22/2017 02:07 AM, Daniel Golle wrote:
> uhttpd refered to ustream-ssl as PKG_BUILD_DEPENDS. While this
> intuitively seems like the correct thing to do, it turns out not to
> have the desired effect: PKG_BUILD_DEPENDS needs to list the resulting
> package name (ie. one of libustream-*) and not the source package name.
> This seems a bit ugly, as PKG_BUILD_DEPENDS should actually really
> reference source package names if you asked me.
> However, to fix things for now, use libustream-mbedtls to fix
> scripts/feeds and parallel builds which otherwise fail to build uhttpd.
> 
> Reported-by: Paul Spooren <paul at spooren.de>
> Signed-off-by: Daniel Golle <daniel at makrotopia.org>

I just checked tmp/.packagedeps on the current master (after deleting and
regenerating tmp) and the dependencies look fine:

> $(curdir)/network/services/uhttpd/compile += $(curdir)/libs/libubox/compile $(curdir)/libs/toolchain/compile $(curdir)/libs/ustream-ssl/compile $(curdir)/system/ubus/compile $(curdir)/utils/lua/compile $(if $(CONFIG_SSP_SUPPORT),$(curdir)/libs/toolchain/compile) $(if $(CONFIG_USE_GLIBC),$(curdir)/libs/toolchain/compile)

$(curdir)/libs/ustream-ssl/compile is correctly listed as a build
dependency without your patch.

Matthias


> ---
>  package/network/services/uhttpd/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
> index 3d483b692d..12896a1bb2 100644
> --- a/package/network/services/uhttpd/Makefile
> +++ b/package/network/services/uhttpd/Makefile
> @@ -18,7 +18,7 @@ PKG_MIRROR_HASH:=2ac4ba8dc0b349d72174aac9ff693a73a214295a9890fe3d2a8eedcad54d06e
>  PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
>  PKG_LICENSE:=ISC
>  
> -PKG_BUILD_DEPENDS = ustream-ssl
> +PKG_BUILD_DEPENDS = libustream-mbedtls
>  
>  include $(INCLUDE_DIR)/package.mk
>  include $(INCLUDE_DIR)/cmake.mk
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/lede-dev/attachments/20170710/58585401/attachment.sig>