This is a version bump from 0.9.20 to 1.5.1 Signed-off-by: Oliver Graute <[email protected]> --- 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 <[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) += 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 <[email protected]>") @$(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 [email protected]
