From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=bjornoya.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YOWKn-0005Es-30 for ptxdist@pengutronix.de; Thu, 19 Feb 2015 20:00:25 +0100 Received: from [IPv6:2001:6f8:105b:1122:74a3:35b1:2b8b:42dc] (dyn-2001-06f8-105b-1122-74a3-35b1-2b8b-42dc.pool.blackshift.org [IPv6:2001:6f8:105b:1122:74a3:35b1:2b8b:42dc]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: frogger) by bjornoya.do.blackshift.org (Postfix) with ESMTPSA id B447D60518 for ; Thu, 19 Feb 2015 20:00:24 +0100 (CET) Message-ID: <54E632C1.8010706@pengutronix.de> Date: Thu, 19 Feb 2015 20:00:17 +0100 From: Marc Kleine-Budde MIME-Version: 1.0 References: <1424256561-17825-1-git-send-email-oliver.graute@neuhaus.de> <20150219161707.GB8151@pengutronix.de> In-Reply-To: <20150219161707.GB8151@pengutronix.de> Subject: Re: [ptxdist] [PATCH 1/2] apr-util: version bump apr-util Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============2024131089==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============2024131089== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="vtX4P8qfQRWvFRhr0cavvK5db3O4292sX" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --vtX4P8qfQRWvFRhr0cavvK5db3O4292sX Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=20 >> this is necessary for the Apache2 version bump=20 >> >> Signed-off-by: Oliver Graute >> --- >> 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 >> +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germ= any, Oliver Graute >> # >> # See CREDITS for details about who has contributed to this project. >> # >> @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_APR_UTIL) +=3D apr-util >> # >> # Paths and names >> # >> -APR_UTIL_VERSION :=3D 0.9.19 >> -APR_UTIL_MD5 :=3D 927a200513018a579cc9936c05d35206 >> +APR_UTIL_VERSION :=3D 1.5.4 >> +APR_UTIL_MD5 :=3D 866825c04da827c6e5f53daff5569f42 >> APR_UTIL :=3D apr-util-$(APR_UTIL_VERSION) >> APR_UTIL_SUFFIX :=3D tar.bz2 >> APR_UTIL_URL :=3D http://archive.apache.org/dist/apr/$(APR_UTIL).$(A= PR_UTIL_SUFFIX) >> @@ -29,14 +30,17 @@ APR_UTIL_LICENSE :=3D APLv2 >> # Prepare >> # -------------------------------------------------------------------= --------- >> =20 >> +APR_UTIL_CONF_ENV :=3D $(CROSS_ENV) >> + >> # >> # autoconf >> # >> APR_UTIL_CONF_TOOL :=3D autoconf >> APR_UTIL_CONF_OPT :=3D \ >> $(CROSS_AUTOCONF_USR) \ >> - --with-apr=3D$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \ >> - --with-expat=3D$(PTXDIST_SYSROOT_TARGET)/usr >> + --with-apr=3D$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \ >=20 > 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 =2E.. > find "${pkg_pkg_dir}" ! -type d -name "${pkg_binconfig_glob}" | whi= le read config; do > sed -i -e "s:@SYSROOT@:${pkg_sysroot_dir}:g" "${config}" && > if [ "${pkg_type}" =3D "target" ]; then > cp -P -- "${config}" "${PTXDIST_SYSROOT_CROSS}/bin" || retu= rn > fi > done && with > pkg_binconfig_glob=3D"${pkg_binconfig_glob:-*-config}" And the*-config scripts are also automatically mangeld in ptxd_make_world_install_pack() Marc --=20 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 | --vtX4P8qfQRWvFRhr0cavvK5db3O4292sX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJU5jLHAAoJECte4hHFiupUkh8P/RlIxAkxLG5XFEtrKp78hRDv kHVLpxcwJFgEenPof2HRtzW+58PwkbRIDpOMMvxvZEn3TzVyZqrd2G9YFozimL+w cOYYmIsI5z4pZS66LM54WcEXAefu3iIG4ki0vEop7fArPa9YIFQMyVT95pNC9UZm J5KDen2T0hpMY0/Bi+JkOTeLjtl5GytaEpCusyQWSv64Yp4fXQuIg6TIHqYdnAvm qJJ+5obsKhJvgrjyyl/sEF0jqm5wWanArhPQ+auzlNqlUzULp86Rz2O7lPN3UFw1 dSTCwENNpPFBXcSstzuwRVrRfYJ5lha7uHb/8MQVFzp64NBdmWd0Bx/4ko/4iWeP fqKnfFeyP8FrF2X3P8Amfh2HWV3a85v22oYovQFrjvDrt2EwK1Yj82XxWtUcM0L7 SAMHVaSajR3Ofl9lGwQVeWcqTg9ePrHYAG6GSgBWmAYTxt+gIhz/308rkPXIKNJg 9JuPjepxDcsiBZ+ajYXxIXu/SK38ifxy29GbbzNs0CXlo8+FCnx1doxTUH56PbCR lsz+3rKkoims2utU2SH2q02EIEI5XiiAL6iOvAU7G1bsJzuZa0gRklWxYZehUlTr Lk3iKgmXoDnC52Ntb4I8Y37qKTeI5a0GXA0d6F7j2U7wW5xsPBNedyyr1XXMvS8Y m6NKZD98KwZ5KGeGBeFX =vIV8 -----END PGP SIGNATURE----- --vtX4P8qfQRWvFRhr0cavvK5db3O4292sX-- --===============2024131089== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============2024131089==--