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 1YO3FH-0005QW-NI for ptxdist@pengutronix.de; Wed, 18 Feb 2015 12:56:47 +0100 Received: from [IPv6:2001:6f8:105b:1122:4cf0:26b6:8bcb:ba7b] (dyn-2001-06f8-105b-1122-4cf0-26b6-8bcb-ba7b.pool.blackshift.org [IPv6:2001:6f8:105b:1122:4cf0:26b6:8bcb:ba7b]) (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 7554F60810 for ; Wed, 18 Feb 2015 12:56:46 +0100 (CET) Resent-To: ptxdist Resent-Message-ID: <54E47DFA.2040802@pengutronix.de> In-Reply-To: <54E47037.3080308@pengutronix.de> References: <1424256318-16788-1-git-send-email-oliver.graute@neuhaus.de> <54E47037.3080308@pengutronix.de> Message-ID: From: Oliver.Graute@neuhaus.de Date: Wed, 18 Feb 2015 12:48:29 +0100 MIME-Version: 1.0 Subject: [ptxdist] Antwort: Re: [PATCH 1/2] apr: version update to 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="===============1262526667==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: Marc Kleine-Budde This is an S/MIME signed message --===============1262526667== Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg="sha1"; boundary="----5C2D9253CD8B197D61FBD5AA9D23546C" This is an S/MIME signed message ------5C2D9253CD8B197D61FBD5AA9D23546C MIME-Version: 1.0 Content-type: multipart/alternative; Boundary="0__=4EBBF763DFD326758f9e8a93df938690918c4EBBF763DFD32675" Content-Disposition: inline --0__=4EBBF763DFD326758f9e8a93df938690918c4EBBF763DFD32675 Content-type: text/plain; charset=US-ASCII > > @@ -37,8 +38,11 @@ APR_CONF_ENV := \ > > ac_cv_struct_rlimit=yes \ > > apr_cv_mutex_robust_shared=no \ > > apr_cv_process_shared_works=yes \ > > + ac_cv_func_setpgrp_void="yes" \ > > + apr_cv_tcp_nodelay_with_cork="yes" \ > > + ac_cv_sizeof_struct_iovec="8" \ > > I doubt this is true for 64 bit archs. You can either add a proper > autoconf test or make use of PTXCONF_ARCH_LP64 i don't know how to do that. Which autoconf file need to be adapted? Best Regards, Oliver --0__=4EBBF763DFD326758f9e8a93df938690918c4EBBF763DFD32675 Content-type: text/html; charset=US-ASCII Content-Disposition: inline

> > @@ -37,8 +38,11 @@ APR_CONF_ENV := \ > > ac_cv_struct_rlimit=yes \ > > apr_cv_mutex_robust_shared=no \ > > apr_cv_process_shared_works=yes \ > > + ac_cv_func_setpgrp_void="yes" \ > > + apr_cv_tcp_nodelay_with_cork="yes" \ > > + ac_cv_sizeof_struct_iovec="8" \ > > I doubt this is true for 64 bit archs. You can either add a proper > autoconf test or make use of PTXCONF_ARCH_LP64
i don't know how to do that. Which autoconf file need to be adapted?

Best Regards,

Oliver --0__=4EBBF763DFD326758f9e8a93df938690918c4EBBF763DFD32675-- ------5C2D9253CD8B197D61FBD5AA9D23546C Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" MIIJigYJKoZIhvcNAQcCoIIJezCCCXcCAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3 DQEHAaCCB2QwggO7MIICo6ADAgECAhRTTkX+umlHGjEnbVuCyKf7ZDxsAzANBgkq hkiG9w0BAQUFADBlMRgwFgYDVQQDEw9mdzF0Lm5ldWhhdXMuZGUxEDAOBgNVBAsT B0dhdGV3YXkxKjAoBgNVBAoTIURyIE5ldWhhdXMgVGVsZWtvbW11bmlrYXRpb24g R21iSDELMAkGA1UEBhMCZGUwHhcNMDcwMzE5MTYyOTI5WhcNMjcwMzE0MTYyOTI5 WjBlMRgwFgYDVQQDEw9mdzF0Lm5ldWhhdXMuZGUxEDAOBgNVBAsTB0dhdGV3YXkx KjAoBgNVBAoTIURyIE5ldWhhdXMgVGVsZWtvbW11bmlrYXRpb24gR21iSDELMAkG A1UEBhMCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDO/vqAga4J 46o9WABfVwTFOYiUyA7GMnRK5Nck4InVoQYyBd3kZGANQhSFocmiBd0ptwVaJ5Cd ZivSe1K/FzhNVygo5UyL2C85uqrb51H7pVFV93yuB399V6sMnZnMYkoQpfbGdFfe Qx2YlopLkvvJPQK8I9qbpK/XqjxHcnQh21d4D890UWUAWGIDk4iwwyII75k32HJO 2D+fiygjzfoT0azyEfoYH9jUSA3tk3wQX3N3tCLxsCKta1TIaAyb7eUvXlk3rbrW h5UYVuUMaCo8tEC6mLvoG+gJbAhKePOV4DMMOpplBXCw/bj2CXK7q/3TbJ507jO5 6EBt/q+7+nqpAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD AgEGMB0GA1UdDgQWBBTs+JXPYwn0sdl6NX256a/JcW9YoDAfBgNVHSMEGDAWgBTs +JXPYwn0sdl6NX256a/JcW9YoDANBgkqhkiG9w0BAQUFAAOCAQEARW5yvbZw9SgS KfhT+ty1dS3DSdMZdEs4BL2q7lGq/kWM5WecF2U4ygvUd/H2Bw4S7n566gTgMxar h0v3cxw36HqDlT1/ZNsPD1653WLDAVNe1/quRrTMRrXwABa/G9W7T4eOBjcjsX/i d5NR3y9UPbbAkozx0TRSO16puxd8tMcAW/p2zzueErvCJU5OwhGvbDgjhp0eXRKk ifkyCeC9ETda8+FaZhKI9Wsq3FW0fONnYhQui4lIHNPbkLJuL3a10pRSgZamkjy/ gTCeiNj2JyrpMD9SrSe/gxguAElQ5Z2xGlpNvfWmJ8HR4vZBvGvfBq/1c5gjsHiC HVq9sHNdajCCA6EwggKJoAMCAQICBFMqmyQwDQYJKoZIhvcNAQEFBQAwZTEYMBYG A1UEAxMPZncxdC5uZXVoYXVzLmRlMRAwDgYDVQQLEwdHYXRld2F5MSowKAYDVQQK EyFEciBOZXVoYXVzIFRlbGVrb21tdW5pa2F0aW9uIEdtYkgxCzAJBgNVBAYTAmRl MB4XDTE0MDMyMDA3MzkxNloXDTM0MDMxNTA3MzkxNlowgYwxCzAJBgNVBAYTAmRl MSowKAYDVQQKEyFEciBOZXVoYXVzIFRlbGVrb21tdW5pa2F0aW9uIEdtYkgxEDAO BgNVBAsTB0dhdGV3YXkxFjAUBgNVBAMTDU9saXZlciBHcmF1dGUxJzAlBgkqhkiG 9w0BCQEWGE9saXZlci5HcmF1dGVAbmV1aGF1cy5kZTCBnzANBgkqhkiG9w0BAQEF AAOBjQAwgYkCgYEA2cA1OPXmWVqiA/k9LmpBl+jwWl5AIxY7hFwKK1fkbw6tNH5u KUp2HKWohFtvYn15hsGCuHBEgnCTr3pkHc3R4mGThYddqsFdTHYIqou5HKZNIZmw iFZGRFRdRVznTrsnjEvT/jIKPj5Tuz5LtX/1uZCoHZaT6J/by0rpwYSl0g8CAwEA AaOBtDCBsTAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIEsDAsBglghkgBhvhC AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFDmu l84LnAlwk+Dm+1kn3o23RSApMB8GA1UdIwQYMBaAFOz4lc9jCfSx2Xo1fbnpr8lx b1igMCMGA1UdEQQcMBqBGE9saXZlci5HcmF1dGVAbmV1aGF1cy5kZTANBgkqhkiG 9w0BAQUFAAOCAQEAczTZdpx+ts4BrR/V74cT3jS9loTnGARQ9w5pMJ7pZ27ecrc4 YAYgCcd9DXfRcoNbX/DZdjsShLArwiQZE3s8lj+hnbXiZwGswFr+gHaLe6GFX0lv EblxGcbJjXQGmQVhqD/ol31gj7geOEoIOn9gHYxuyWmFT8PDxzfSpL9Q5jMLkjHh DI3+orrKQae8kBXYrXbQhiI7c7xbhOl2WgXRkxS0TFOkOAWAVB0u0NtoxXMDPHPW eedw3q5/5h3gHxHPoffGfgSXlNiTI8Jj9LQ3RMF4VWKHynOHuDzxip9kxD2awhJI IISXkGksMdvABoFXlweOSu9tc7tGc7nq2Zn3BzGCAe4wggHqAgEBMG0wZTEYMBYG A1UEAxMPZncxdC5uZXVoYXVzLmRlMRAwDgYDVQQLEwdHYXRld2F5MSowKAYDVQQK EyFEciBOZXVoYXVzIFRlbGVrb21tdW5pa2F0aW9uIEdtYkgxCzAJBgNVBAYTAmRl AgRTKpskMAkGBSsOAwIaBQCggdgwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc BgkqhkiG9w0BCQUxDxcNMTUwMjE4MTE0ODUwWjAjBgkqhkiG9w0BCQQxFgQUnt6b FtABWywag8bH2GHzVRxe7JkweQYJKoZIhvcNAQkPMWwwajALBglghkgBZQMEASow CwYJYIZIAWUDBAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0D AgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJ KoZIhvcNAQEBBQAEgYDW+ZgPUXQnSIMIe707/IXmNzpMS9FBB2RnOIxRtC0DuD60 emox3VgRbC5Ssni2PqzEjjFMKh0ZC5/ZkAPIfbQLwOEYKeVJspivX4U/d3MHIcPt 5v2PzLQMSnK30Y1G+G7q39K4n1Wh3uHRt8x8rgVc87dMM0N2F8g2h/0/n1KYHQ== ------5C2D9253CD8B197D61FBD5AA9D23546C-- --===============1262526667== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============1262526667==-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YOTig-0003Sp-PC for ptxdist@pengutronix.de; Thu, 19 Feb 2015 17:12:54 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1YOTig-0005Id-NR for ptxdist@pengutronix.de; Thu, 19 Feb 2015 17:12:54 +0100 Date: Thu, 19 Feb 2015 17:12:54 +0100 From: Michael Olbrich Message-ID: <20150219161254.GA8151@pengutronix.de> References: <1424256318-16788-1-git-send-email-oliver.graute@neuhaus.de> <1424256318-16788-2-git-send-email-oliver.graute@neuhaus.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1424256318-16788-2-git-send-email-oliver.graute@neuhaus.de> Subject: Re: [ptxdist] [PATCH 2/2] added 0001-apr-gen-test-char.patch Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Wed, Feb 18, 2015 at 11:45:18AM +0100, Oliver Graute wrote: > > Signed-off-by: Oliver Graute > --- > patches/apr-1.5.1/0001-apr-gen-test-char.patch | 69 ++++++++++++++++++++++++ > patches/apr-1.5.1/series | 1 + > 2 files changed, 70 insertions(+) > create mode 100644 patches/apr-1.5.1/0001-apr-gen-test-char.patch > create mode 100644 patches/apr-1.5.1/series > > diff --git a/patches/apr-1.5.1/0001-apr-gen-test-char.patch b/patches/apr-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 Proper patch header please. > @@ -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 /usr/lib > + # Since the user is specifying they are linking with libtool, we > + # *know* that -R will be recognized by libtool. > +- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" > ++ flags="$flags -L@SYSROOT@$libdir -l${APR_LIBNAME}" > + else > + flags="$flags $LA_FILE" > + fi > +diff -rupN AK/include/private/apr_escape_test_char.h AL/include/private/apr_escape_test_char.h > +--- AK/include/private/apr_escape_test_char.h 1970-01-01 01:00:00.000000000 +0100 > ++++ AL/include/private/apr_escape_test_char.h 2015-02-12 13:53:10.195232200 +0100 No. This should be generated. Copy the tool from host-apr. See e.g. host-mesalib/mesalib for an example how to do this. Michael > +@@ -0,0 +1,23 @@ > ++/* this file is automatically generated by gen_test_char, do not edit. "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] = { > ++ 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 > ++}; > +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) > + > + # Create apr_rules.mk suitable for the install tree > + build/apr_rules.out: build/apr_rules.mk > +- sed -e 's,^$apr_build.*=$.*$$,\1$(installbuilddir),' -e 's,^$top_build.*=$.*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@ > ++ sed 's,^$apr_build.*=$.*$$,\1@SYSROOT@$(installbuilddir),' < build/apr_rules.mk > $@ > + > + install: $(TARGETS) > + $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \ > +@@ -132,14 +132,9 @@ etags: > + make_tools_dir: > + $(APR_MKDIR) tools > + > +-OBJECTS_gen_test_char = 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@ > $@ > + > + LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \ > + @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@ > diff --git a/patches/apr-1.5.1/series b/patches/apr-1.5.1/series > new file mode 100644 > index 0000000..9b5a323 > --- /dev/null > +++ b/patches/apr-1.5.1/series > @@ -0,0 +1 @@ > +0001-apr-gen-test-char.patch > -- > 1.7.9.5 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YO28G-0007px-Ac for ptxdist@pengutronix.de; Wed, 18 Feb 2015 11:45:29 +0100 Received: by mail-wi0-f179.google.com with SMTP id hi2so1192785wib.0 for ; Wed, 18 Feb 2015 02:45:23 -0800 (PST) From: Oliver Graute Date: Wed, 18 Feb 2015 11:45:17 +0100 Message-Id: <1424256318-16788-1-git-send-email-oliver.graute@neuhaus.de> Subject: [ptxdist] [PATCH 1/2] apr: version update to 1.5.1 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Oliver Graute This is a version bump from 0.9.20 to 1.5.1 Signed-off-by: Oliver Graute --- rules/apr.make | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rules/apr.make b/rules/apr.make index 9c3b11d..557ff83 100644 --- a/rules/apr.make +++ b/rules/apr.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2012 by Marc Kleine-Budde +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute # # See CREDITS for details about who has contributed to this project. # @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_APR) += apr # # Paths and names # -APR_VERSION := 0.9.20 -APR_MD5 := 6dd59a88ee75b8cdf719a90b5a2f2485 +APR_VERSION := 1.5.1 +APR_MD5 := d3538d67e6455f48cc935d8f0a50a1c3 APR := apr-$(APR_VERSION) APR_SUFFIX := tar.bz2 APR_URL := http://archive.apache.org/dist/apr/$(APR).$(APR_SUFFIX) @@ -37,8 +38,11 @@ APR_CONF_ENV := \ ac_cv_struct_rlimit=yes \ apr_cv_mutex_robust_shared=no \ apr_cv_process_shared_works=yes \ + ac_cv_func_setpgrp_void="yes" \ + apr_cv_tcp_nodelay_with_cork="yes" \ + ac_cv_sizeof_struct_iovec="8" \ + apr_cv_mutex_recursive="yes" \ apr_cv_pthreads_lib="-lpthread" - # # autoconf # @@ -55,7 +59,7 @@ $(STATEDIR)/apr.install.post: @$(call targetinfo) @$(call world/install.post, APR) sed -i -e "s~@SYSROOT@~${PTXDIST_SYSROOT_TARGET}~g" \ - $(PTXDIST_SYSROOT_TARGET)/usr/build/apr_rules.mk + $(PTXDIST_SYSROOT_TARGET)/usr/build-1/apr_rules.mk @$(call touch) # ---------------------------------------------------------------------------- @@ -71,7 +75,7 @@ $(STATEDIR)/apr.targetinstall: @$(call install_fixup, apr,AUTHOR,"Marc Kleine-Budde ") @$(call install_fixup, apr,DESCRIPTION,missing) - @$(call install_lib, apr, 0, 0, 0644, libapr-0) + @$(call install_lib, apr, 0, 0, 0644, libapr-1) @$(call install_finish, apr) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de 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 1YO3WA-0006tx-3u for ptxdist@pengutronix.de; Wed, 18 Feb 2015 13:14:14 +0100 Received: from [IPv6:2001:6f8:105b:1122:4cf0:26b6:8bcb:ba7b] (dyn-2001-06f8-105b-1122-4cf0-26b6-8bcb-ba7b.pool.blackshift.org [IPv6:2001:6f8:105b:1122:4cf0:26b6:8bcb:ba7b]) (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 CA7AC60827 for ; Wed, 18 Feb 2015 13:14:13 +0100 (CET) Message-ID: <54E48211.7040702@pengutronix.de> Date: Wed, 18 Feb 2015 13:14:09 +0100 From: Marc Kleine-Budde MIME-Version: 1.0 References: <1424256318-16788-1-git-send-email-oliver.graute@neuhaus.de> <54E47037.3080308@pengutronix.de> In-Reply-To: Subject: Re: [ptxdist] Antwort: Re: [PATCH 1/2] apr: version update to 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="===============1912115333==" 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) --===============1912115333== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="xJI7SwsuJ7XxMDdeIhqulDbi3UrNMCDeR" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --xJI7SwsuJ7XxMDdeIhqulDbi3UrNMCDeR Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Please keep the list on Cc. On 02/18/2015 12:48 PM, Oliver.Graute@neuhaus.de wrote: >> > @@ -37,8 +38,11 @@ APR_CONF_ENV :=3D \ >> > ac_cv_struct_rlimit=3Dyes \ >> > apr_cv_mutex_robust_shared=3Dno \ >> > apr_cv_process_shared_works=3Dyes \ >> > + ac_cv_func_setpgrp_void=3D"yes" \ >> > + apr_cv_tcp_nodelay_with_cork=3D"yes" \ >> > + ac_cv_sizeof_struct_iovec=3D"8" \ >> >> I doubt this is true for 64 bit archs. You can either add a proper >> autoconf test or make use of PTXCONF_ARCH_LP64 >=20 > i don't know how to do that. Which autoconf file need to be adapted? You have to replace the following in configure.in: > APR_CHECK_SIZEOF_EXTENDED([#include = =20 > #include ],struct iovec,0) = =20 with the proper call to: > AC_CHECK_SIZEOF 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 | --xJI7SwsuJ7XxMDdeIhqulDbi3UrNMCDeR 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 iQIcBAEBCgAGBQJU5IIUAAoJECte4hHFiupU55gP/2LsyP4EAqihtdFPSrqds9Mq 8PNcdyf89RIY7pqaH9y93ys6yE/46Avcmt8Lw6kQMs6k13abPk1xrqrIjZc3uxsE ALIJNmFxmGBH7pcKlJy/qYDm/fm37tUdxxDjIIJCk7ONaF8OOPaPGZgX4Ns5GxLk SsFMWT4x8fKBorH/4hu+WCJSe9lo3RxKn7591x2IEcmny0IHVfRO1EcmdKrtjTPD AehfkddLvbyk5L77+qNQi6ZuLOowRbU0iJoJyuY8HVOu2SDkSoXlUK0DAzdXLaQc 9GiLGUtjJPe9rIzqWSdU/3z9LRsvMYuHYBgKKKTeqDu/2cnSlgcaYBNLznjbLRhJ bwb78VnOkZQRj5ToSDuPgSgBWR7CUUtSzjwv03l2noRgm2+mWGriY2r2HDdO9pE1 vaw7nKFY0fX6yNwcCMT3OFGS8NsdEWkBQ9zAhw/QuflEsb23zjVpKyxNa1yaXi3P tSaT6sVlRQXveA82HTJds8sv0U0GbPPEVNh/nOShAn5NRpyM3oLybS1q8sEUAGF2 5/jerEio0xJpARakhZua645MRIda+sxtS1FsWr3lZyVnC3pJi56Yae2p96+BXoFY 4kIBy1B28OhSgnELDJbFj9TdGqH59JBKFGJLhQCbT2N1Z5kHCmYwngW/raC5XQFM nnqEoKw4JGkCDnnRNAjT =C6Gl -----END PGP SIGNATURE----- --xJI7SwsuJ7XxMDdeIhqulDbi3UrNMCDeR-- --===============1912115333== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============1912115333==-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YO28K-0007wA-LA for ptxdist@pengutronix.de; Wed, 18 Feb 2015 11:45:33 +0100 Received: by mail-wi0-f180.google.com with SMTP id h11so1188783wiw.1 for ; Wed, 18 Feb 2015 02:45:27 -0800 (PST) From: Oliver Graute Date: Wed, 18 Feb 2015 11:45:18 +0100 Message-Id: <1424256318-16788-2-git-send-email-oliver.graute@neuhaus.de> In-Reply-To: <1424256318-16788-1-git-send-email-oliver.graute@neuhaus.de> References: <1424256318-16788-1-git-send-email-oliver.graute@neuhaus.de> Subject: [ptxdist] [PATCH 2/2] added 0001-apr-gen-test-char.patch Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Oliver Graute Signed-off-by: Oliver Graute --- patches/apr-1.5.1/0001-apr-gen-test-char.patch | 69 ++++++++++++++++++++++++ patches/apr-1.5.1/series | 1 + 2 files changed, 70 insertions(+) create mode 100644 patches/apr-1.5.1/0001-apr-gen-test-char.patch create mode 100644 patches/apr-1.5.1/series diff --git a/patches/apr-1.5.1/0001-apr-gen-test-char.patch b/patches/apr-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 /usr/lib + # Since the user is specifying they are linking with libtool, we + # *know* that -R will be recognized by libtool. +- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" ++ flags="$flags -L@SYSROOT@$libdir -l${APR_LIBNAME}" + else + flags="$flags $LA_FILE" + fi +diff -rupN AK/include/private/apr_escape_test_char.h AL/include/private/apr_escape_test_char.h +--- AK/include/private/apr_escape_test_char.h 1970-01-01 01:00:00.000000000 +0100 ++++ AL/include/private/apr_escape_test_char.h 2015-02-12 13:53:10.195232200 +0100 +@@ -0,0 +1,23 @@ ++/* this file is automatically generated by gen_test_char, do not edit. "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] = { ++ 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 ++}; +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) + + # Create apr_rules.mk suitable for the install tree + build/apr_rules.out: build/apr_rules.mk +- sed -e 's,^$apr_build.*=$.*$$,\1$(installbuilddir),' -e 's,^$top_build.*=$.*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@ ++ sed 's,^$apr_build.*=$.*$$,\1@SYSROOT@$(installbuilddir),' < build/apr_rules.mk > $@ + + install: $(TARGETS) + $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \ +@@ -132,14 +132,9 @@ etags: + make_tools_dir: + $(APR_MKDIR) tools + +-OBJECTS_gen_test_char = 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@ > $@ + + LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \ + @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@ diff --git a/patches/apr-1.5.1/series b/patches/apr-1.5.1/series new file mode 100644 index 0000000..9b5a323 --- /dev/null +++ b/patches/apr-1.5.1/series @@ -0,0 +1 @@ +0001-apr-gen-test-char.patch -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Message-ID: <54E47037.3080308@pengutronix.de> Date: Wed, 18 Feb 2015 11:57:59 +0100 From: Marc Kleine-Budde MIME-Version: 1.0 References: <1424256318-16788-1-git-send-email-oliver.graute@neuhaus.de> In-Reply-To: <1424256318-16788-1-git-send-email-oliver.graute@neuhaus.de> Subject: Re: [ptxdist] [PATCH 1/2] apr: version update to 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="===============0711415793==" 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) --===============0711415793== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="0xcPgN6BD7nQQXmAjbppmS8wleWgjLKGp" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0xcPgN6BD7nQQXmAjbppmS8wleWgjLKGp Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 02/18/2015 11:45 AM, Oliver Graute wrote: > This is a version bump from 0.9.20 to 1.5.1 >=20 > Signed-off-by: Oliver Graute > --- > rules/apr.make | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) >=20 > diff --git a/rules/apr.make b/rules/apr.make > index 9c3b11d..557ff83 100644 > --- a/rules/apr.make > +++ b/rules/apr.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 = ^^ one space should be enough > # > # See CREDITS for details about who has contributed to this project. > # > @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_APR) +=3D apr > # > # Paths and names > # > -APR_VERSION :=3D 0.9.20 > -APR_MD5 :=3D 6dd59a88ee75b8cdf719a90b5a2f2485 > +APR_VERSION :=3D 1.5.1 > +APR_MD5 :=3D d3538d67e6455f48cc935d8f0a50a1c3 > APR :=3D apr-$(APR_VERSION) > APR_SUFFIX :=3D tar.bz2 > APR_URL :=3D http://archive.apache.org/dist/apr/$(APR).$(APR_SUFFIX) > @@ -37,8 +38,11 @@ APR_CONF_ENV :=3D \ > ac_cv_struct_rlimit=3Dyes \ > apr_cv_mutex_robust_shared=3Dno \ > apr_cv_process_shared_works=3Dyes \ > + ac_cv_func_setpgrp_void=3D"yes" \ > + apr_cv_tcp_nodelay_with_cork=3D"yes" \ > + ac_cv_sizeof_struct_iovec=3D"8" \ I doubt this is true for 64 bit archs. You can either add a proper autoconf test or make use of PTXCONF_ARCH_LP64 > + apr_cv_mutex_recursive=3D"yes" \ > apr_cv_pthreads_lib=3D"-lpthread" > - ^^^ please don't remove that line > # > # autoconf > # > @@ -55,7 +59,7 @@ $(STATEDIR)/apr.install.post: > @$(call targetinfo) > @$(call world/install.post, APR) > sed -i -e "s~@SYSROOT@~${PTXDIST_SYSROOT_TARGET}~g" \ > - $(PTXDIST_SYSROOT_TARGET)/usr/build/apr_rules.mk > + $(PTXDIST_SYSROOT_TARGET)/usr/build-1/apr_rules.mk > @$(call touch) > =20 > # --------------------------------------------------------------------= -------- > @@ -71,7 +75,7 @@ $(STATEDIR)/apr.targetinstall: > @$(call install_fixup, apr,AUTHOR,"Marc Kleine-Budde ") > @$(call install_fixup, apr,DESCRIPTION,missing) > =20 > - @$(call install_lib, apr, 0, 0, 0644, libapr-0) > + @$(call install_lib, apr, 0, 0, 0644, libapr-1) > =20 > @$(call install_finish, apr) regards, 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 | --0xcPgN6BD7nQQXmAjbppmS8wleWgjLKGp 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 iQIcBAEBCgAGBQJU5HA8AAoJECte4hHFiupUg18QAKm1hhOYHSbxn2hpQkWyOjOD 1EuYKMCJECHekhnx6vuQBRxVmZc+Djvn6hkBIbRNP8NfpmsZ4JmEBeAaYsXVFtSb SanU87+RX8FOv+6weSl4tSBt8iJDK858G447OBu3IbNjR7hgskGM1xCQzsHCSfBk 8nPQ1ueg73cUlIqqXWBQxxCkfD6IVIGLANGxqeTshAbCIGQvoK50R3xtEWv03ZTj RVMmC80ZAifRnJjHl7yLWd45CcTddQtkQMTAXv/ulDNITCxqqvRJh414yWgvGjKY 4+c7u4xj6jNEuTTdNlpfGQq3EPUSegHFJsIx4pzxExBjDk9LKPJi0y0a8hg4akzy CFzB5mYo4IHZowVTZlM4b2Eu521VnkZVjwGWg8TKf/3/1LDXXoAw0Xw8KAjX1dE4 BZAchl9dGPaKPtrelqeCPiP/ErwVjt0j9f86JLOSkxxyl5zOznfoUSyI3+Ixm3Fz 5GHCyXFXlyWmLkoxuE9lTEIncefnTHPMLg38PgZ7Nv9IgDnAsIQaXd6Tb4AkR/Xi cnKEIM9TiblAISRkI2w1pQIpRwC+Ht8Rv+CGgG3+VhwFAxhmRkty6QefWUQvqc0s YRpwRosKmycLOhblWeS4Q/BCvmgMJg9v4SfMDJnB5zXdhHZLVLRaw2hczVkYV36w bGq/+Om9RuRW5IESSeXF =MSQe -----END PGP SIGNATURE----- --0xcPgN6BD7nQQXmAjbppmS8wleWgjLKGp-- --===============0711415793== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============0711415793==--