From c7eb8fb48f7482692e0d57615f1185bd298a7665 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sat, 5 Nov 2011 19:59:03 +0000 Subject: [PATCH] [backfire] packages: merge r28760, r28763, r28764 & r28765 SVN-Revision: 28773 --- libs/apr-util/Makefile | 4 +++- libs/apr/Makefile | 7 +++++-- libs/apr/patches/101-fix_apr_time_now.patch | 13 +++++++++++++ net/subversion/Makefile | 5 ++++- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 libs/apr/patches/101-fix_apr_time_now.patch diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile index 80806cc3e7..2ed9983836 100644 --- a/libs/apr-util/Makefile +++ b/libs/apr-util/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apr-util PKG_VERSION:=1.3.12 -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 @@ -32,6 +32,8 @@ define Package/libaprutil endef TARGET_CFLAGS += $(FPIC) +TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE + CONFIGURE_ARGS += \ --with-pgsql=no \ --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 91776bde53..e3e5a65e69 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 @@ -31,6 +31,8 @@ define Package/libapr endef TARGET_CFLAGS += $(FPIC) +TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE + CONFIGURE_ARGS += \ --with-devrandom=/dev/urandom \ --disable-dso \ @@ -39,10 +41,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, diff --git a/net/subversion/Makefile b/net/subversion/Makefile index 9eb8041ff8..690f10d502 100644 --- a/net/subversion/Makefile +++ b/net/subversion/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=subversion PKG_VERSION:=1.6.17 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://subversion.tigris.org/downloads @@ -73,6 +73,9 @@ define Package/subversion-server/conffiles /etc/config/subversion endef +TARGET_CFLAGS += $(FPIC) +TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE + CONFIGURE_ARGS += \ --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \ -- 2.30.2