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-util: version update to 1.5.4
Date: Wed,  4 Mar 2015 11:00:50 +0100	[thread overview]
Message-ID: <1425463251-8517-1-git-send-email-oliver.graute@neuhaus.de> (raw)

This patch update apr-util to version 1.5.4
this version is required by apache 2.4 

Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 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..cce9385 100644
--- a/rules/apr-util.make
+++ b/rules/apr-util.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_UTIL) += apr-util
 #
 # Paths and names
 #
-APR_UTIL_VERSION	:= 0.9.19
-APR_UTIL_MD5		:= 927a200513018a579cc9936c05d35206
+APR_UTIL_VERSION	:= 1.5.4
+APR_UTIL_MD5		:= 866825c04da827c6e5f53daff5569f42
 APR_UTIL		:= apr-util-$(APR_UTIL_VERSION)
 APR_UTIL_SUFFIX		:= tar.bz2
 APR_UTIL_URL		:= http://archive.apache.org/dist/apr/$(APR_UTIL).$(APR_UTIL_SUFFIX)
@@ -29,14 +30,17 @@ APR_UTIL_LICENSE	:= APLv2
 # Prepare
 # ----------------------------------------------------------------------------
 
+APR_UTIL_CONF_ENV	:= $(CROSS_ENV)
+
 #
 # autoconf
 #
 APR_UTIL_CONF_TOOL := autoconf
 APR_UTIL_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
-	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \
-	--with-expat=$(PTXDIST_SYSROOT_TARGET)/usr
+	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \
+	--with-expat=$(PTXDIST_SYSROOT_TARGET)/usr/include/apr-1
+
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -51,7 +55,7 @@ $(STATEDIR)/apr-util.targetinstall:
 	@$(call install_fixup, apr-util,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, apr-util,DESCRIPTION,missing)
 
-	@$(call install_lib, apr-util, 0, 0, 0644, libaprutil-0)
+	@$(call install_lib, apr-util, 0, 0, 0644, libaprutil-1)
 
 	@$(call install_finish, apr-util)
 
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2015-03-04 10:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-04 10:00 Oliver Graute [this message]
2015-03-04 10:00 ` [ptxdist] [PATCHv2 2/2] apr-util: added patches for apr-util 1.5.4 Oliver Graute
2015-03-04 10:07 ` [ptxdist] [PATCHv2 1/2] apr-util: version update to 1.5.4 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=1425463251-8517-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