From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Message-ID: <54F6D8C3.9000004@pengutronix.de> Date: Wed, 04 Mar 2015 11:04:51 +0100 From: Marc Kleine-Budde MIME-Version: 1.0 References: <1425463143-3905-1-git-send-email-oliver.graute@neuhaus.de> <1425463143-3905-2-git-send-email-oliver.graute@neuhaus.de> In-Reply-To: <1425463143-3905-2-git-send-email-oliver.graute@neuhaus.de> Subject: Re: [ptxdist] [PATCHv2 2/2] apr: added patches for apr-1.5.1 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="===============0896756205==" 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) --===============0896756205== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="jS1gN7qjirgn1tFkTKIs6Jve1QrxvDUI4" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --jS1gN7qjirgn1tFkTKIs6Jve1QrxvDUI4 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 03/04/2015 10:59 AM, Oliver Graute wrote: > patches to compile apr on arm platform >=20 > Signed-off-by: Oliver Graute > --- > patches/apr-1.5.1/0001-apr-gen-test-char.patch | 69 ++++++++++++++++= +++ > patches/apr-1.5.1/0002-ac-check-sizeof.patch | 22 +++++++ > patches/apr-1.5.1/0003-Makefile-in.patch | 84 ++++++++++++++++= ++++++++ > patches/apr-1.5.1/series | 2 + > 4 files changed, 177 insertions(+) > create mode 100644 patches/apr-1.5.1/0001-apr-gen-test-char.patch > create mode 100644 patches/apr-1.5.1/0002-ac-check-sizeof.patch > create mode 100644 patches/apr-1.5.1/0003-Makefile-in.patch > create mode 100644 patches/apr-1.5.1/series >=20 > diff --git a/patches/apr-1.5.1/0001-apr-gen-test-char.patch b/patches/a= pr-1.5.1/0001-apr-gen-test-char.patch > new file mode 100644 > index 0000000..12d47f6 > --- /dev/null > +++ b/patches/apr-1.5.1/0001-apr-gen-test-char.patch > @@ -0,0 +1,69 @@ > +diff -rupN AK/apr-config.in AL/apr-config.in > +--- AK/apr-config.in 2015-02-12 11:36:28.000000000 +0100 > ++++ AL/apr-config.in 2015-02-12 11:44:24.515350580 +0100 > +@@ -200,7 +200,7 @@ while test $# -gt 0; do > + ### avoid using -L if libdir is a "standard" location like /u= sr/lib > + # Since the user is specifying they are linking with libtool,= we > + # *know* that -R will be recognized by libtool. > +- flags=3D"$flags -L$libdir -R$libdir -l${APR_LIBNAME}" > ++ flags=3D"$flags -L@SYSROOT@$libdir -l${APR_LIBNAME}" I think this is done automatically during the install stage. > + else > + flags=3D"$flags $LA_FILE" > + fi > +diff -rupN AK/include/private/apr_escape_test_char.h AL/include/privat= e/apr_escape_test_char.h > +--- AK/include/private/apr_escape_test_char.h 1970-01-01 01:00:00.0000= 00000 +0100 > ++++ AL/include/private/apr_escape_test_char.h 2015-02-12 13:53:10.1952= 32200 +0100 > +@@ -0,0 +1,23 @@ > ++/* this file is automatically generated by gen_test_char, do not edit= =2E "make include/private/apr_escape_test_char.h" to regenerate. */ > ++#define T_ESCAPE_SHELL_CMD (1) > ++#define T_ESCAPE_PATH_SEGMENT (2) > ++#define T_OS_ESCAPE_PATH (4) > ++#define T_ESCAPE_ECHO (8) > ++#define T_ESCAPE_URLENCODED (16) > ++#define T_ESCAPE_XML (32) > ++ > ++static const unsigned char test_char_table[256] =3D { > ++ 32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30, > ++ 30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17, > ++ 17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23, > ++ 55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, > ++ 0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0, > ++ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, > ++ 0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30, > ++ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, > ++ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, > ++ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, > ++ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, > ++ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, > ++ 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30=20 > ++}; > +diff -rupN AK/Makefile.in AL/Makefile.in > +--- AK/Makefile.in 2014-03-17 16:10:26.000000000 +0100 > ++++ AL/Makefile.in 2015-02-12 15:42:23.506233505 +0100 > +@@ -71,7 +71,7 @@ apr-config.out: $(APR_CONFIG) > +=20 > + # Create apr_rules.mk suitable for the install tree > + build/apr_rules.out: build/apr_rules.mk > +- sed -e 's,^\(apr_build.*=3D\).*$$,\1$(installbuilddir),' -e 's,^\(to= p_build.*=3D\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@ > ++ sed 's,^\(apr_build.*=3D\).*$$,\1@SYSROOT@$(installbuilddir),' < bui= ld/apr_rules.mk > $@ > +=20 > + install: $(TARGETS) > + $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(ins= tallbuilddir) \ > +@@ -132,14 +132,9 @@ etags: > + make_tools_dir: > + $(APR_MKDIR) tools > +=20 > +-OBJECTS_gen_test_char =3D tools/gen_test_char.lo $(LOCAL_LIBS) > +-tools/gen_test_char.lo: make_tools_dir > +-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) > +- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) > +- > +-include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ > +- $(APR_MKDIR) include/private > +- tools/gen_test_char@EXEEXT@ > $@ > ++#include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ > ++# $(APR_MKDIR) include/private > ++# tools/gen_test_char@EXEEXT@ > $@ > +=20 > + LINK_PROG =3D $(LIBTOOL) $(LTFLAGS) --mode=3Dlink $(COMPILE) $(LT_LDF= LAGS) \ > + @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@ > diff --git a/patches/apr-1.5.1/0002-ac-check-sizeof.patch b/patches/apr= -1.5.1/0002-ac-check-sizeof.patch > new file mode 100644 > index 0000000..225ed54 > --- /dev/null > +++ b/patches/apr-1.5.1/0002-ac-check-sizeof.patch > @@ -0,0 +1,22 @@ > +diff -rupN AV/configure.in AU/configure.in > +--- AV/configure.in 2015-02-18 13:35:04.619502605 +0100 > ++++ AU/configure.in 2014-01-25 16:17:29.000000000 +0100 > +@@ -1693,8 +1693,7 @@ else > + socklen_t_value=3D"int" > + fi > +=20 > +-AC_CHECK_SIZEOF([#include ], pid_t, 8) > +- > ++APR_CHECK_SIZEOF_EXTENDED([#include ], pid_t, 8) Why do you replace the standard AC_CHECK_SIZEOF by the non standard APR_CHECK_SIZEOF_EXTENDED? 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 | --jS1gN7qjirgn1tFkTKIs6Jve1QrxvDUI4 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 iQIcBAEBCgAGBQJU9tjDAAoJECte4hHFiupUOegQAKDd/ouKXDF3BMpKz9nFUBeu TbxapnYQDxmsBrJgeVLUZDphKaZjXSZ7po7KV0WRgPli5PzN4Zh+46EqjDiYk387 vxxCSVuUtbbH11cqADyvbq7ETI8/WlWiSQK6tVqPOTa/wyNZtH0A+hk87vRugych as21sFyIpiQKOLzmoUzcDC9yUBr9nzMTuNO895U3d8XpbhBa2hoJEmkzMRsRhwyZ NKu8Yk+/9wrpuRxZe1DLwNc4mJqr0X0Lwux0sHuh3Kqa29gq8v4DlcxWHMea325d QxPoVLkzypj6oVbQVusCR6hYIG7cAaKoWa0YI9rX67A7K1o8pnwKtN+dP71flZwL OE1925xBCv4qwzEHCosVcFl6LzJrWDFoivhCx0q7qNhYBiaI8PFtQTFM5HQsowXg ldGkkIxDSNexU3XL6naCSHxrYY+0lHbIbETBYh81xrnv7YS+zy5wfffTeSaAqdhE GsoNAy86PXoRIwdBwpl8Ht29nh6hpKdC9yadXmX3Hmr2HsHBzROBybImxMVyaGaA yGL/TjWDGMgglURQ5T2VglSqYi3uG6czFrdmJ4/adyU8GUQitw+wY69U1Zc51v16 r6O8XDHyLXbwq98tJFz181S7D/AI+0hdm1gza6Cj/4WxF+Dw/VZm/lUq450nKyZd 9Bygofgu3YPAYd28Ou0Q =y8qU -----END PGP SIGNATURE----- --jS1gN7qjirgn1tFkTKIs6Jve1QrxvDUI4-- --===============0896756205== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============0896756205==--