This is a apr-util version bump from 0.9.19 to 1.5.4 this is necessary for the Apache2 version bump
Signed-off-by: Oliver Graute <[email protected]> --- 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..86aa107 100644 --- a/rules/apr-util.make +++ b/rules/apr-util.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2012 by Marc Kleine-Budde <[email protected]> +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute <[email protected]> # # 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 <[email protected]>") @$(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 [email protected]
