From 1fd429b14f04b57c2236ce0340ae934c34c1721c Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sat, 5 Nov 2011 01:54:36 +0000 Subject: [PATCH] packages/apr: force LFS support, fix apr_time_now function (closes: #9287) SVN-Revision: 28760 --- libs/apr/Makefile | 5 +++-- libs/apr/patches/101-fix_apr_time_now.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 libs/apr/patches/101-fix_apr_time_now.patch diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 91776bde53..cad13d226e 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apr PKG_VERSION:=1.4.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr @@ -39,10 +39,11 @@ CONFIGURE_ARGS += \ # XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure CONFIGURE_VARS += \ ac_cv_sizeof_struct_iovec=1 \ + ac_cv_struct_rlimit=yes \ apr_cv_process_shared_works=no \ apr_cv_mutex_robust_shared=no \ apr_cv_tcp_nodelay_with_cork=yes \ - ac_cv_struct_rlimit=yes \ + apr_cv_use_lfs64=yes \ LDFLAGS="$$$$LDFLAGS -lpthread" \ define Build/InstallDev diff --git a/libs/apr/patches/101-fix_apr_time_now.patch b/libs/apr/patches/101-fix_apr_time_now.patch new file mode 100644 index 0000000000..6ad14a37c1 --- /dev/null +++ b/libs/apr/patches/101-fix_apr_time_now.patch @@ -0,0 +1,13 @@ +https://dev.openwrt.org/ticket/9287 + +--- a/time/unix/time.c ++++ b/time/unix/time.c +@@ -75,7 +75,7 @@ APR_DECLARE(apr_time_t) apr_time_now(voi + { + struct timeval tv; + gettimeofday(&tv, NULL); +- return tv.tv_sec * APR_USEC_PER_SEC + tv.tv_usec; ++ return tv.tv_sec * (apr_time_t)APR_USEC_PER_SEC + (apr_time_t)tv.tv_usec; + } + + static void explode_time(apr_time_exp_t *xt, apr_time_t t, -- 2.30.2