Re: [ptxdist] [PATCH 2/2] c-ares: added rule file

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Wed, Feb 11, 2015 at 05:41:00PM +0100, Oliver Graute wrote:
> 	new file:   c-ares.make

Both files in one patch please.

> 
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
>  rules/c-ares.make |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 61 insertions(+)
>  create mode 100644 rules/c-ares.make
> 
> diff --git a/rules/c-ares.make b/rules/c-ares.make
> new file mode 100644
> index 0000000..a7d3d93
> --- /dev/null
> +++ b/rules/c-ares.make
> @@ -0,0 +1,61 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute <oliver.graute@neuhaus.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_C_ARES) += c-ares
> +
> +#
> +# Paths and names
> +#
> +C_ARES_VERSION	:= 1.10.0
> +C_ARES_MD5		:= 6d325e6ef7afbb0a1041a4d2b1266533
> +C_ARES		:= c-ares-$(C_ARES_VERSION)
> +C_ARES_SUFFIX	:= tar.gz
> +C_ARES_URL		:= http://c-ares.haxx.se/download//$(C_ARES).$(C_ARES_SUFFIX)
> +C_ARES_SOURCE	:= $(SRCDIR)/$(C_ARES).$(C_ARES_SUFFIX)
> +C_ARES_DIR		:= $(BUILDDIR)/$(C_ARES)
> +C_ARES_LICENSE	:= MIT license
> +
> +# autoconf
> +#
> +C_ARES_CONF_TOOL	:= autoconf
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/c-ares.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, c-ares)
> +	@$(call install_fixup, c-ares,PRIORITY,optional)
> +	@$(call install_fixup, c-ares,SECTION,base)
> +	@$(call install_fixup, c-ares,AUTHOR,"<oliver.graute@neuhaus.de>")
> +	@$(call install_fixup, c-ares,DESCRIPTION,missing)
> +
> +#ifdef PTXCONF_C_ARES
> +#	@$(call install_copy, c-ares, 0, 0, 0755, -, \
> +#		/usr/bin/c-ares)
> +#endif

Either install it, or remove these lines.

> +ifdef PTXCONF_C_ARES

Remove. This is only called if the package is enabled anyways.

> +	@$(call install_copy, c-ares, 0, 0, 0644, $(PTXDIST_WORKSPACE)/platform-$(PTXCONF_PLATFORM)/packages/$(C_ARES)/usr/lib/libcares.so.2.1.0, /usr/lib/libcares.so.2.1.0)
> +	@$(call install_link, c-ares,  /usr/lib/libcares.so.2.1.0, /usr/lib/libcares.so.2)
> +	#@$(call install_link, c-ares, /usr/lib/libcares.so.2, /usr/lib/libcares.so.2.1.0)
> +    #@$(call install_lib, c-ares, 0, 0, 0644, $(PTXDIST_WORKSPACE)/platform-$(PTXCONF_PLATFORM)/packages/$(C_ARES)/usr/lib/libcares.so.2.1.0, /usr/lib/libcares.so.2)
> +	#@$(call install_copy, c-ares, 0, 0, 0644, $(PTXDIST_WORKSPACE)/platform-$(PTXCONF_PLATFORM)/packages/$(C_ARES)/usr/lib/libcares, /usr/lib/)

use install_lib. Check other rules for examples. It will resolve the paths
for you and handle the links.

Michael

> +endif
> +	@$(call install_finish, c-ares)
> +
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 1.7.9.5
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de