From 833b277feec15f76d57a5b31e257d3c792f1405f Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 28 Mar 2011 21:22:19 +0000 Subject: [PATCH] [package] update pmacct to 0.12.5 This patch update pmacct from 0.10.3 (21-06-2006) to 0.12.5 (28-12-2010) Thanks in advance. Signed-off-by: Etienne CHAMPETIER SVN-Revision: 26336 --- admin/pmacct/Makefile | 7 +++---- admin/pmacct/patches/001-honor_cflags.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 admin/pmacct/patches/001-honor_cflags.patch diff --git a/admin/pmacct/Makefile b/admin/pmacct/Makefile index 9480345c5a..0cb8c979f7 100644 --- a/admin/pmacct/Makefile +++ b/admin/pmacct/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pmacct -PKG_VERSION:=0.10.3 +PKG_VERSION:=0.12.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pmacct.net/ -PKG_MD5SUM:=0be1ffd9d4bda73575caa3240abbf4cb +PKG_MD5SUM:=3d10f9301a17f034a0f221490a99a5d0 PKG_BUILD_DEPENDS:=libpcap @@ -98,7 +98,6 @@ $(PKG_BUILD_DIR)/nfacctd$(1) $(PKG_BUILD_DIR)/pmacctd$(1): $(STAMP_CONFIGURED) ,,\ ); $(MAKE) -C $(PKG_BUILD_DIR) \ - CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ all mv -f $(PKG_BUILD_DIR)/src/nfacctd $(PKG_BUILD_DIR)/nfacctd$(1) mv -f $(PKG_BUILD_DIR)/src/pmacctd $(PKG_BUILD_DIR)/pmacctd$(1) diff --git a/admin/pmacct/patches/001-honor_cflags.patch b/admin/pmacct/patches/001-honor_cflags.patch new file mode 100644 index 0000000000..14d17110d2 --- /dev/null +++ b/admin/pmacct/patches/001-honor_cflags.patch @@ -0,0 +1,20 @@ +--- a/configure ++++ b/configure +@@ -1083,7 +1083,7 @@ fi + + + if test "x$ac_cv_prog_gcc" = xyes ; then +- CFLAGS="-O2" ++ CFLAGS="-O2 ${CFLAGS}" + case "$host_os" in + IRIX*) + CFLAGS="-mabi=n32 -fno-builtins ${CFLAGS}" +@@ -1097,7 +1097,7 @@ else + LDFLAGS="-n32 -L/usr/lib32 -L/usr/freeware/lib32 ${LDFLAGS}" + ;; + OSF*) +- CFLAGS="-O -assume noaligned_objects" ++ CFLAGS="-O -assume noaligned_objects ${CFLAGS}" + ;; + esac + fi -- 2.30.2