mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Oliver Graute <oliver.graute@gmail.com>
To: ptxdist@pengutronix.de
Cc: Oliver Graute <oliver.graute@neuhaus.de>
Subject: [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1
Date: Wed,  4 Mar 2015 10:59:02 +0100	[thread overview]
Message-ID: <1425463143-3905-1-git-send-email-oliver.graute@neuhaus.de> (raw)

This is a version bump to apr 1.5.1 its a required by apache 2.4

Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 rules/apr.make |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/rules/apr.make b/rules/apr.make
index 9c3b11d..a287859 100644
--- a/rules/apr.make
+++ b/rules/apr.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) += 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,6 +38,10 @@ 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"
 
 #
@@ -55,7 +60,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 +76,7 @@ $(STATEDIR)/apr.targetinstall:
 	@$(call install_fixup, apr,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(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

             reply	other threads:[~2015-03-04  9:59 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-04  9:59 Oliver Graute [this message]
2015-03-04  9:59 ` [ptxdist] [PATCHv2 2/2] apr: added patches for apr-1.5.1 Oliver Graute
2015-03-04 10:04   ` Marc Kleine-Budde
2015-03-04 10:02 ` [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1 Marc Kleine-Budde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1425463143-3905-1-git-send-email-oliver.graute@neuhaus.de \
    --to=oliver.graute@gmail.com \
    --cc=oliver.graute@neuhaus.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox