From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Message-ID: <54F6D95C.3050705@pengutronix.de> Date: Wed, 04 Mar 2015 11:07:24 +0100 From: Marc Kleine-Budde MIME-Version: 1.0 References: <1425463251-8517-1-git-send-email-oliver.graute@neuhaus.de> In-Reply-To: <1425463251-8517-1-git-send-email-oliver.graute@neuhaus.de> Subject: Re: [ptxdist] [PATCHv2 1/2] apr-util: version update to 1.5.4 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="===============0150273527==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Oliver Graute This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============0150273527== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="epx0m2klRiWlCvrslaups3WDSmeP4neE5" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --epx0m2klRiWlCvrslaups3WDSmeP4neE5 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=20 >=20 > Signed-off-by: Oliver Graute > --- > rules/apr-util.in | 1 - > rules/apr-util.make | 14 +++++++++----- > 2 files changed, 9 insertions(+), 6 deletions(-) >=20 > 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 > +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germa= ny, 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).$(AP= R_UTIL_SUFFIX) > @@ -29,14 +30,17 @@ APR_UTIL_LICENSE :=3D APLv2 > # Prepare > # --------------------------------------------------------------------= -------- > =20 > +APR_UTIL_CONF_ENV :=3D $(CROSS_ENV) why do you add this? > + > # > # 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 \ > + --with-expat=3D$(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 --=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 | --epx0m2klRiWlCvrslaups3WDSmeP4neE5 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 iQIcBAEBCgAGBQJU9tlcAAoJECte4hHFiupUpv4P/Aq41KtH01G7nkPEnrFueinC ezSJnmQSh0f/LSNlmPAK70PTlAZDloBlHdWT3Yc9YGAB0nQgRM76W8liDgBs3jDE tU2ftTZTLJREysrWm0iSdkWcMUVEp8m77bURUTizbs+cFEIlARXEsnK2OzOko1BN mDSsR0WtJbrN2MDxwU3CkAQ3OPVHhIOiBgyZR9jR4o5C8GRHiFjWBsctPdFGWiXv cNprKKk0KrLQskeLhLEk+aRl/BtzxTLK8mT60AFB/qOM9MKbZ2EZBGh8zkNm/YwT vvzYascnAqpcmZVXAWSjnGarjqIuaRLmi/18ShbHu+VdJyszBcXHYnbKUFZSlcRZ obEtnc3QiT98+f1DKjh2tfZUYjUWwfCe7oFWfzEJgBi4eTVNBHLCzQZ3mvOOgktx P4u1aNOx/jtGDN8AE6XIuIiTvtsbZ5W3Z/kveh2qXBSagAka7CaKG0DJLY2Hkwz3 xhlsWYgIwINWB7GfETbqpXVU0NZ/BIKDMjHDNFY8WHeHXHzXnZzMBR9tKIN5nf6h FzVBWsFFW/4zlzUGN5b2E9alR4lafc72sQDx5ENgEpBdSCEqw/iM0o+EufkhhHMU RmBaSjm8kWzV6pelxGv+CUuYBn0W/AxC12LiKQZuN3Wg9CRYXbibpiJfDUiyWPdX iDYVs9Ifh8+gGUCUnhSS =DgS7 -----END PGP SIGNATURE----- --epx0m2klRiWlCvrslaups3WDSmeP4neE5-- --===============0150273527== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============0150273527==--