Re: [ptxdist] [PATCHv2 1/2] apr-util: version update to 1.5.4

[Marc Kleine-Budde <mkl@pengutronix.de>]

[-- Attachment #1.1: Type: text/plain, Size: 2507 bytes --]

On 03/04/2015 11:00 AM, Oliver Graute wrote:
> This patch update apr-util to version 1.5.4
> this version is required by apache 2.4 
> 
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
>  rules/apr-util.in   |    1 -
>  rules/apr-util.make |   14 +++++++++-----
>  2 files changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/rules/apr-util.in b/rules/apr-util.in
> index aaacfad..6e53726 100644
> --- a/rules/apr-util.in
> +++ b/rules/apr-util.in
> @@ -3,7 +3,6 @@
>  config APR_UTIL
>  	tristate
>  	select APR
> -	select HOST_APR_UTIL
>  	select EXPAT
>  	prompt "apr-util"
>  	help
> diff --git a/rules/apr-util.make b/rules/apr-util.make
> index 821a838..cce9385 100644
> --- a/rules/apr-util.make
> +++ b/rules/apr-util.make
> @@ -1,6 +1,7 @@
>  # -*-makefile-*-
>  #
>  # Copyright (C) 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
> +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute <oliver.graute@neuhaus.de>
>  #
>  # See CREDITS for details about who has contributed to this project.
>  #
> @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_APR_UTIL) += apr-util
>  #
>  # Paths and names
>  #
> -APR_UTIL_VERSION	:= 0.9.19
> -APR_UTIL_MD5		:= 927a200513018a579cc9936c05d35206
> +APR_UTIL_VERSION	:= 1.5.4
> +APR_UTIL_MD5		:= 866825c04da827c6e5f53daff5569f42
>  APR_UTIL		:= apr-util-$(APR_UTIL_VERSION)
>  APR_UTIL_SUFFIX		:= tar.bz2
>  APR_UTIL_URL		:= http://archive.apache.org/dist/apr/$(APR_UTIL).$(APR_UTIL_SUFFIX)
> @@ -29,14 +30,17 @@ APR_UTIL_LICENSE	:= APLv2
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> +APR_UTIL_CONF_ENV	:= $(CROSS_ENV)

why do you add this?

> +
>  #
>  # autoconf
>  #
>  APR_UTIL_CONF_TOOL := autoconf
>  APR_UTIL_CONF_OPT := \
>  	$(CROSS_AUTOCONF_USR) \
> -	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \
> -	--with-expat=$(PTXDIST_SYSROOT_TARGET)/usr
> +	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \
> +	--with-expat=$(PTXDIST_SYSROOT_TARGET)/usr/include/apr-1

why pointing expat to /usr/include/apr-1?

Please fix the errors discussed in the previous mails before reposting
you patch.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de