Changeset 29812


Ignore:
Timestamp:
2012-01-19T17:40:08+01:00 (6 years ago)
Author:
jow
Message:

[packages] mrtg:

  • don't patch configure, but use autoreconf instead
  • remove extra CFLAGS and LDFLAGS, they're unneeded after recent toolchain rework
  • set PKG_REVISION
  • wrap long DEPENDS line
Location:
packages/packages/net/mrtg
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/packages/net/mrtg/Makefile

    r29811 r29812  
    11#  
    2 # Copyright (C) 2011 OpenWrt.org 
     2# Copyright (C) 2011-2012 OpenWrt.org 
    33# Copyright (C) 2011 Paolo Pisati <p.pisati@gmail.com> 
    44# 
     
    1111PKG_NAME:=mrtg 
    1212PKG_VERSION:=2.17.3 
    13 PKG_RELEASE:= 
     13PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    1818 
    1919PKG_INSTALL:=1 
     20PKG_FIXUP:=autoreconf 
    2021 
    2122include $(INCLUDE_DIR)/package.mk 
     
    2425  SECTION:=net 
    2526  CATEGORY:=Network 
    26   DEPENDS:=+libgd +libpng +zlib +perl +perlbase-essential +perlbase-findbin +perlbase-cwd +perlbase-config +perlbase-file +perlbase-getopt +perlbase-math +perlbase-integer +perlbase-xsloader +perlbase-pod +perlbase-universal +perlbase-socket +perlbase-posix +perlbase-autoloader +perlbase-fcntl +perlbase-tie +perlbase-io +perlbase-symbol +perlbase-selectsaver +perlbase-errno 
     27  DEPENDS:=+libgd +libpng +zlib +perl +perlbase-essential +perlbase-findbin \ 
     28    +perlbase-cwd +perlbase-config +perlbase-file +perlbase-getopt \ 
     29    +perlbase-math +perlbase-integer +perlbase-xsloader +perlbase-pod \ 
     30    +perlbase-universal +perlbase-socket +perlbase-posix +perlbase-autoloader \ 
     31    +perlbase-fcntl +perlbase-tie +perlbase-io +perlbase-symbol \ 
     32    +perlbase-selectsaver +perlbase-errno 
    2733  TITLE:=The Multi Router Traffic Grapher 
    2834  URL:=http://oss.oetiker.ch/mrtg/index.en.html 
     
    3844endef 
    3945 
    40 EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) 
    41 EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib 
    42  
    4346define Package/mrtg/install 
    4447        $(INSTALL_DIR) $(1)/usr/bin 
  • packages/packages/net/mrtg/patches/001-rm-printf-longlong-fmt-test.patch

    r29811 r29812  
    4949 AC_CHECK_LIB(m, pow, [ MATHLIBS="-lm" ]) 
    5050  
    51 --- mrtg-2.17.3.orig/configure  2011-12-26 00:02:43.178539074 +0100 
    52 +++ mrtg-2.17.3/configure       2011-12-26 00:04:09.056241468 +0100 
    53 @@ -3609,60 +3609,6 @@ 
    54  done 
    55   
    56   
    57 -# Taken from libIDL-0.8.2 
    58 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for printf long long format specifier" >&5 
    59 -$as_echo_n "checking for printf long long format specifier... " >&6; } 
    60 -if test "${long_long_format_specifier+set}" = set; then : 
    61 -  $as_echo_n "(cached) " >&6 
    62 -else 
    63 - 
    64 -    for format in ll l q I64; do 
    65 -        if test "$cross_compiling" = yes; then : 
    66 -  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
    67 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    68 -as_fn_error $? "cannot run test program while cross compiling 
    69 -See \`config.log' for more details" "$LINENO" 5 ; } 
    70 -else 
    71 -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    72 -/* end confdefs.h.  */ 
    73 -#include <stdio.h> 
    74 -            int main() 
    75 -            { 
    76 -                long long b, a = -0x3AFAFAFAFAFAFAFALL; 
    77 -                char buffer[1000]; 
    78 -                sprintf (buffer, "%${format}u", a); 
    79 -                sscanf (buffer, "%${format}u", &b); 
    80 -                exit (b!=a); 
    81 -            } 
    82 - 
    83 -_ACEOF 
    84 -if ac_fn_c_try_run "$LINENO"; then : 
    85 -  long_long_format_specifier="%${format}d" 
    86 -            long_long_format="${format}d" 
    87 -            break 
    88 -fi 
    89 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ 
    90 -  conftest.$ac_objext conftest.beam conftest.$ac_ext 
    91 -fi 
    92 - 
    93 -        done 
    94 -fi 
    95 - 
    96 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $long_long_format_specifier" >&5 
    97 -$as_echo "$long_long_format_specifier" >&6; } 
    98 - 
    99 -cat >>confdefs.h <<_ACEOF 
    100 -#define LLD "$long_long_format_specifier" 
    101 -_ACEOF 
    102 - 
    103 - 
    104 -cat >>confdefs.h <<_ACEOF 
    105 -#define LLD_FORMAT "$long_long_format" 
    106 -_ACEOF 
    107 - 
    108 - 
    109 - 
    110 - 
    111  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 
    112  $as_echo_n "checking for pow in -lm... " >&6; } 
    113  if test "${ac_cv_lib_m_pow+set}" = set; then : 
Note: See TracChangeset for help on using the changeset viewer.