summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill2011-11-09 11:25:07 +0000
committerNicolas Thill2011-11-09 11:25:07 +0000
commit3d9c0158c270d412746408ff345ba31c74ffa849 (patch)
tree0b4b3270fc73364b55762183cac5005ef098df4f
parent45e49b7c5dc17ff272d45011dac2fe2a4cae9256 (diff)
downloadpackages-3d9c0158c270d412746408ff345ba31c74ffa849.tar.gz
packages/apache: merge r28845, r28846 & r28847
SVN-Revision: 28878
-rw-r--r--net/apache/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/apache/Makefile b/net/apache/Makefile
index 999b85dd7..fa16417c1 100644
--- a/net/apache/Makefile
+++ b/net/apache/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=apache
PKG_VERSION:=2.2.15
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE_NAME:=httpd
PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
@@ -87,6 +87,9 @@ $(call Package/apache/Default/description)
This package contains the icons from Apache.
endef
+TARGET_CFLAGS += $(FPIC)
+TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+
define Build/Configure
$(call Build/Configure/Default, \
--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
@@ -102,6 +105,7 @@ define Build/Configure
--sysconfdir=/etc/apache \
ap_cv_void_ptr_lt_long=no \
logfiledir="/var/log" \
+ runtimedir="/var/run" \
)
endef