From 9436a026e2e23d207fbdcb9e8bc9b076e3573700 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 22 Jan 2011 22:37:50 +0100 Subject: activate GCC cflags check, cleanup FLAGS stuff in OpenADK. * remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ... * activate GCC_HONOUR_COPTS and fix all packages to honour CFLAGS * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all build compilation, remove HOST* variants * introduce KERNEL_MODULE_FLAGS for external kernel modules * mark rpm package as broken, mark syslinux for native builds only, mark libhugetlb for eglibc/glibc only usage --- package/pmacct/patches/patch-configure | 41 ++++++++++++++ .../patches/patch-src_nfprobe_plugin_netflow9_c | 64 ---------------------- 2 files changed, 41 insertions(+), 64 deletions(-) create mode 100644 package/pmacct/patches/patch-configure delete mode 100644 package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c (limited to 'package/pmacct/patches') diff --git a/package/pmacct/patches/patch-configure b/package/pmacct/patches/patch-configure new file mode 100644 index 000000000..0c7310ba6 --- /dev/null +++ b/package/pmacct/patches/patch-configure @@ -0,0 +1,41 @@ +--- pmacct-0.12.5.orig/configure 2010-12-28 17:26:21.000000000 +0100 ++++ pmacct-0.12.5/configure 2011-01-21 21:15:15.478658080 +0100 +@@ -1006,7 +1006,6 @@ fi + + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" +-CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 + echo "configure:1012: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then +@@ -1022,22 +1021,6 @@ rm -f conftest* + + fi + +-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS="$ac_save_CFLAGS" +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi +-fi + + host_os=`uname` + host_cpu=`uname -m` +@@ -1083,7 +1066,6 @@ fi + + + if test "x$ac_cv_prog_gcc" = xyes ; then +- CFLAGS="-O2" + case "$host_os" in + IRIX*) + CFLAGS="-mabi=n32 -fno-builtins ${CFLAGS}" diff --git a/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c b/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c deleted file mode 100644 index a0f757c8f..000000000 --- a/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c +++ /dev/null @@ -1,64 +0,0 @@ ---- pmacct-0.12.2.orig/src/nfprobe_plugin/netflow9.c 2010-04-21 16:53:36.000000000 +0200 -+++ pmacct-0.12.2/src/nfprobe_plugin/netflow9.c 2010-07-15 15:11:23.575859230 +0200 -@@ -396,8 +396,8 @@ nf9_init_template(void) - */ - - rcount = 0; -- bzero(&v4_template, sizeof(v4_template)); -- bzero(&v4_int_template, sizeof(v4_int_template)); -+ memset(&v4_template, 0, sizeof(v4_template)); -+ memset(&v4_int_template, 0, sizeof(v4_int_template)); - - v4_template.r[rcount].type = htons(NF9_LAST_SWITCHED); - v4_template.r[rcount].length = htons(4); -@@ -588,8 +588,8 @@ nf9_init_template(void) - v4_int_template.tot_rec_len += v4_int_template.r[idx].length; - - rcount = 0; -- bzero(&v6_template, sizeof(v6_template)); -- bzero(&v6_int_template, sizeof(v6_int_template)); -+ memset(&v6_template, 0, sizeof(v6_template)); -+ memset(&v6_int_template, 0, sizeof(v6_int_template)); - - v6_template.r[rcount].type = htons(NF9_LAST_SWITCHED); - v6_template.r[rcount].length = htons(4); -@@ -786,8 +786,8 @@ nf9_init_options_template(void) - int rcount, idx; - - rcount = 0; -- bzero(&options_template, sizeof(options_template)); -- bzero(&options_int_template, sizeof(options_int_template)); -+ memset(&options_template, 0, sizeof(options_template)); -+ memset(&options_int_template, 0, sizeof(options_int_template)); - - options_template.r[rcount].type = htons(NF9_OPT_SCOPE_SYSTEM); - options_template.r[rcount].length = htons(0); -@@ -826,8 +826,8 @@ nf_flow_to_flowset(const struct FLOW *fl - char *ftoft_ptr_0 = ftoft_buf_0; - char *ftoft_ptr_1 = ftoft_buf_1; - -- bzero(ftoft_buf_0, sizeof(ftoft_buf_0)); -- bzero(ftoft_buf_1, sizeof(ftoft_buf_1)); -+ memset(ftoft_buf_0, 0, sizeof(ftoft_buf_0)); -+ memset(ftoft_buf_1, 0, sizeof(ftoft_buf_1)); - *len_used = nflows = ret_len = 0; - - rec32 = htonl(timeval_sub_ms(&flow->flow_last, system_boot_time)); -@@ -916,7 +916,7 @@ nf_options_to_flowset(u_char *packet, u_ - u_int8_t rec8; - char *ftoft_ptr_0 = ftoft_buf_0; - -- bzero(ftoft_buf_0, sizeof(ftoft_buf_0)); -+ memset(ftoft_buf_0, 0, sizeof(ftoft_buf_0)); - *len_used = nflows = ret_len = 0; - - rec8 = 1; /* NF9_FLOW_SAMPLER_ID */ -@@ -975,7 +975,7 @@ send_netflow_v9(struct FLOW **flows, int - - last_valid = num_packets = 0; - for (j = 0; j < num_flows;) { -- bzero(packet, sizeof(packet)); -+ memset(packet, 0, sizeof(packet)); - nf9 = (struct NF9_HEADER *)packet; - - nf9->version = htons(9); -- cgit v1.2.3