Changeset 2858

Show
Ignore:
Timestamp:
06/19/07 15:28:24 (1 year ago)
Author:
tg
Message:

austriancoder suggested that I pack tsort(1) into tools/ for these
whose tsort doesn't do -r

Now, GNU tsort doesn't do -r, and the only other tsort I know comes
bundled with mirmake (and depends too much on libmirmake and its other
inner workings to separate it from it), and mirmake has a dependency
on guess what…

This is untested, but seems to work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/Makefile

    r2788 r2858  
    148148        @echo "TOPDIR:=$$(readlink -nf .)" >lbin/prereq.mk 
    149149        @echo "BASH:=$$(lbin/which bash)" >>lbin/prereq.mk 
    150         @if lbin/which mksh >/dev/null 2>&1; then \ 
    151                 echo "MBSH:=$$(lbin/which mksh)" >>lbin/prereq.mk; \ 
    152         else \ 
    153                 echo "MBSH:=$$(lbin/which bash)" >>lbin/prereq.mk; \ 
    154         fi 
    155150        @echo 'GMAKE:=$${TOPDIR}/lbin/gmake' >>lbin/prereq.mk 
    156151        @echo "GNU_HOST_NAME:=$$(${CC} -dumpmachine | sed \ 
    …… 
    196191        fi 
    197192        @${GMAKE_INV} tools/install-lbin 
     193        @if lbin/which mksh >/dev/null 2>&1; then \ 
     194                echo "MBSH:=$$(lbin/which mksh)" >>lbin/prereq.mk; \ 
     195        else \ 
     196                echo "MBSH:=$$(lbin/which bash)" >>lbin/prereq.mk; \ 
     197        fi 
    198198        @echo '===> Prerequisites checked successfully.' 
    199199        @touch $@ 

  • trunk/freewrt/package/mksh/Makefile

    r2823 r2858  
    66 
    77include ${TOPDIR}/rules.mk 
    8  
    9 PKG_NAME=               mksh 
    10 PKG_VERSION=            29.6 
    11 PKG_RELEASE=            2 
    12 DISTFILES=              ${PKG_NAME}-R29f.cpio.gz 
    13 #DISTFILES=             mksh_${PKG_VERSION}.tar.gz 
    14 PKG_MD5SUM=             83b4ca84faa1a1ea4cf6db6eb41a0384 
    15  
    16 MASTER_SITES=           ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} 
    17 #MASTER_SITES=          http://users.unixforge.de/~tglaser/ 
    18 WRKDIST=                ${WRKDIR}/${PKG_NAME} 
    19  
     8include Makefile.inc 
    209include ${TOPDIR}/mk/package.mk 
    2110 

  • trunk/freewrt/scripts/scan-tools.sh

    r2857 r2858  
    387387fi 
    388388 
    389 if ! which tsort >/dev/null 2>&1; then 
    390         echo You must install \"tsort\" to continue. 
    391         echo 
    392         out=1 
    393 fi 
    394 v=$(printf 'a b\nb c\n' | tsort -r 2>/dev/null | md5sum) 
    395 if [[ ${v%% *} != 0617bc44e824dd65da71d04b29c85e63 ]]; then 
    396         echo Your tsort does not support the -r option. 
    397         echo Install one which does to continue. 
    398         out=1 
    399 fi 
     389have_tsort=0 
     390if which tsort >/dev/null 2>&1; then 
     391        v=$(printf 'a b\nb c\n' | tsort -r 2>/dev/null | md5sum) 
     392        [[ ${v%% *} = 0617bc44e824dd65da71d04b29c85e63 ]] && have_tsort=1 
     393fi 
     394 
     395if [[ $have_tsort=0 ]]; then 
     396        echo USE_TOOLS_MIRMAKE=1 >>$topdir/lbin/prereq.mk 
     397        if ! which mksh >/dev/null 2>&1; then 
     398                echo USE_TOOLS_MKSH=1 >>$topdir/lbin/prereq.mk 
     399        fi 
     400fi 
     401 
    400402 
    401403cd $topdir 

  • trunk/freewrt/tools/Makefile

    r2594 r2858  
    1212TARGETS+=       paxmirabilis 
    1313TARGETS+=       sed 
     14 
     15# Conditionals 
     16ifneq (${USE_TOOLS_MKSH},) 
     17TARGETS+=       mksh 
     18endif 
     19ifneq (${USE_TOOLS_MIRMAKE},) 
     20TARGETS+=       mirmake         # depends on mksh 
     21endif 
    1422 
    1523TARGETS+=       brcm-utils