Changeset 2744

Show
Ignore:
Timestamp:
06/08/07 13:07:29 (2 years ago)
Author:
tg
Message:

never run autoconf or automake, really
(I'll commit the regenerated patches for privoxy in a minute)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/freewrt/package/privoxy/Makefile

    r2678 r2744  
    1919$(eval $(call PKG_template,PRIVOXY,privoxy,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    2020 
    21 # XXX autoconf stuff should be done in a better way 
    22 # this works on openbsd-current and mirports-current, 
    23 # as well as these which don't use metaauto 
    24  
     21TLDFLAGS+=              -pthread 
    2522CONFIGURE_STYLE:=       gnu 
    2623CONFIGURE_ENV+=         ac_cv_func_setpgrp_void=no 
    2724BUILD_STYLE:=           auto 
    28 MAKE_FLAGS+=            SPECIAL_CFLAGS="-pthread ${TLDFLAGS}" 
     25MAKE_FLAGS+=            SPECIAL_CFLAGS='${TLDFLAGS}' 
    2926MAKE_FILE:=             GNUmakefile 
    3027INSTALL_STYLE:=         auto 
    31  
    32 pre-configure: 
    33         (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ 
    34                 if which autoconf-2.59 >&- 2>&-; then \ 
    35                         export AUTOCONF_VERSION=2.59; \ 
    36                 elif which autoconf-2.60 >&- 2>&-; then \ 
    37                         export AUTOCONF_VERSION=2.60; \ 
    38                 fi; \ 
    39                 autoheader && \ 
    40                 autoconf ; \ 
    41         ) 
    4228 
    4329post-install: 
  • trunk/freewrt/scripts/scan-pkgs.sh

    r2702 r2744  
    6969fi 
    7070 
    71 if [[ -n $FWRT_PACKAGE_PRIVOXY ]]; then 
    72         NEED_AUTOCONF_2_59="$NEED_AUTOCONF_2_59 privoxy" 
    73 fi 
    74  
    7571if [[ -n $FWRT_PACKAGE_RUBY ]]; then 
    7672        NEED_RUBY="$NEED_RUBY ruby" 
     
    114110fi 
    115111 
    116 if [[ -n $NEED_AUTOCONF_2_59 ]]; then 
    117         if ! AUTOCONF_VERSION=2.59 autoconf --help 2>&1 | \ 
    118             fgrep gnu.org >/dev/null 2>&1; then 
    119                 echo >&2 You need autoconf 2.59 to build $NEED_AUTOCONF_2_59 
    120                 out=1 
    121         fi 
    122 fi 
    123  
    124112if [[ -n $FWRT_USE_CCACHE ]]; then 
    125113        if ! which ccache >/dev/null 2>&1; then 
  • trunk/freewrt/scripts/scan-tools.sh

    r2689 r2744  
    403403        exit 1 
    404404EOF 
     405cp lbin/autoconf lbin/autoheader 
    405406cat >lbin/automake <<-EOF 
    406407        #!$BASH 
     
    409410EOF 
    410411chmod a+x lbin/autoconf lbin/automake 
     412cp lbin/autoconf lbin/autoheader 
     413cp lbin/automake lbin/aclocal 
    411414 
    412415exit $out