Re: [ptxdist] [PATCH 1/2] apr-util: version bump apr-util

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

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

On 02/19/2015 05:17 PM, Michael Olbrich wrote:
> On Wed, Feb 18, 2015 at 11:49:20AM +0100, Oliver Graute wrote:
>> This is a apr-util version bump from 0.9.19 to 1.5.4 
>> this is necessary for the Apache2 version bump 
>>
>> 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..86aa107 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)
>> +
>>  #
>>  # 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 \
> 
> This seems strange (the original, not just your change): I don't think
> there is a $(PTXDIST_SYSROOT_CROSS)/bin/apr-config, it should be in
> PTXDIST_SYSROOT_TARGET. Can you check what configure does here?

*-config is installed automatically to PTXDIST_SYSROOT_CROSS

from scripts/lib/ptxd_make_world_install.sh:

> ptxd_make_world_install_post
...
>     find "${pkg_pkg_dir}" ! -type d -name "${pkg_binconfig_glob}" | while read config; do
>         sed -i -e "s:@SYSROOT@:${pkg_sysroot_dir}:g" "${config}" &&
>         if [ "${pkg_type}" = "target" ]; then
>             cp -P -- "${config}" "${PTXDIST_SYSROOT_CROSS}/bin" || return
>         fi
>     done &&
with
> pkg_binconfig_glob="${pkg_binconfig_glob:-*-config}"

And the*-config scripts are also automatically mangeld in
ptxd_make_world_install_pack()

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