Changeset 30533 for packages


Ignore:
Timestamp:
2012-02-14T19:09:22+01:00 (4 years ago)
Author:
jow
Message:

[packages] collectd: remove further instances of -Werror to fix compilation with gcc 4.6 (#10962)

Location:
packages/utils/collectd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/collectd/Makefile

    r29854 r30533  
    11# 
    2 # Copyright (C) 2006-2011 OpenWrt.org 
     2# Copyright (C) 2006-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=collectd 
    1111PKG_VERSION:=4.10.2 
    12 PKG_RELEASE:=5 
     12PKG_RELEASE:=6 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
  • packages/utils/collectd/patches/003-remove-werror.patch

    r29489 r30533  
    2121        -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ 
    2222        -DLOCALSTATEDIR='"${localstatedir}"' \ 
     23--- a/src/libcollectdclient/Makefile.am 
     24+++ b/src/libcollectdclient/Makefile.am 
     25@@ -1,7 +1,7 @@ 
     26 AUTOMAKE_OPTIONS = foreign no-dependencies 
     27  
     28 if COMPILER_IS_GCC 
     29-AM_CFLAGS = -Wall -Werror 
     30+AM_CFLAGS = -Wall 
     31 endif 
     32  
     33 pkginclude_HEADERS = client.h lcc_features.h 
     34--- a/src/libcollectdclient/Makefile.in 
     35+++ b/src/libcollectdclient/Makefile.in 
     36@@ -329,7 +329,7 @@ top_build_prefix = @top_build_prefix@ 
     37 top_builddir = @top_builddir@ 
     38 top_srcdir = @top_srcdir@ 
     39 AUTOMAKE_OPTIONS = foreign no-dependencies 
     40-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror 
     41+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall 
     42 pkginclude_HEADERS = client.h lcc_features.h 
     43 lib_LTLIBRARIES = libcollectdclient.la 
     44 nodist_pkgconfig_DATA = libcollectdclient.pc 
     45--- a/src/owniptc/Makefile.am 
     46+++ b/src/owniptc/Makefile.am 
     47@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependenci 
     48 EXTRA_DIST = libiptc.c README.collectd 
     49  
     50 if COMPILER_IS_GCC 
     51-AM_CFLAGS = -Wall -Werror 
     52+AM_CFLAGS = -Wall 
     53 endif 
     54  
     55 noinst_LTLIBRARIES = libiptc.la 
     56--- a/src/owniptc/Makefile.in 
     57+++ b/src/owniptc/Makefile.in 
     58@@ -298,7 +298,7 @@ top_builddir = @top_builddir@ 
     59 top_srcdir = @top_srcdir@ 
     60 AUTOMAKE_OPTIONS = foreign no-dependencies 
     61 EXTRA_DIST = libiptc.c README.collectd 
     62-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror 
     63+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall 
     64 noinst_LTLIBRARIES = libiptc.la 
     65 libiptc_la_SOURCES = libip4tc.c libip6tc.c \ 
     66                ipt_kernel_headers.h libip6tc.h libiptc.h linux_list.h \ 
Note: See TracChangeset for help on using the changeset viewer.