Changeset 3182

Show
Ignore:
Timestamp:
07/09/07 14:08:12 (1 year ago)
Author:
tg
Message:

revert; didn't work out
since we're cross-compiling, we always need mirmake.h

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/vars.mk

    r3116 r3182  
    1717BUILD_USER=             $(shell id -un) 
    1818BUILD_GROUP=            $(shell id -gn) 
     19BMAKE=                  ${TOPDIR}/lbin/bmake 
    1920BSDMAKE_FLAGS+=         BINOWN=${BUILD_USER} BINGRP=${BUILD_GROUP} 
    2021BSDMAKE_FLAGS+=         LIBOWN=${BUILD_USER} LIBGRP=${BUILD_GROUP} 

  • trunk/freewrt/package/ed/patches/patch-Makefile

    r3180 r3182  
    11$FreeWRT$ 
    2 --- ed.orig/Makefile    Tue Mar 15 18:58:31 2005 
    3 +++ ed/Makefile Mon Jul  9 11:37:12 2007 
    4 @@ -3,14 +3,17 @@ 
     2--- ed.orig/Makefile    2005-03-15 19:58:53.000000000 +0100 
     3+++ ed/Makefile 2007-06-26 18:03:13.000000000 +0200 
     4@@ -3,14 +3,14 @@ 
    55  
    66 PROG=          ed 
    77 SRCS=          buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c 
    88-CPPFLAGS+=     -DBACKWARDS -DDES 
    9 +CPPFLAGS+=     -DBACKWARDS 
    10 +.if exists(${.SYSMK}/mirmake.h) 
    11 +CPPFLAGS+=     -include ${.SYSMK}/mirmake.h 
    12 +.endif 
     9+CPPFLAGS+=     -DBACKWARDS -include ${.SYSMK}/mirmake.h 
    1310  
    1411 #LINKS=  ${BINDIR}/ed ${BINDIR}/red 

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

    r3138 r3182  
    3939opath=$PATH 
    4040out=0 
    41 bmake= 
    4241 
    4342if [[ $NO_ERROR != @(0|1) ]]; then 
    …… 
    8483            <$topdir/scripts/uname.fake >$topdir/lbin/uname 
    8584        chmod 555 $topdir/lbin/uname 
    86         bmake=/usr/bin/make 
    8785        ;; 
    8886NetBSD) 
    …… 
    418416fi 
    419417 
    420 have_tsort=0 
    421 if which tsort >/dev/null 2>&1; then 
    422         v=$(printf 'a b\nb c\n' | tsort -r 2>/dev/null | md5sum) 
    423         [[ ${v%% *} = 0617bc44e824dd65da71d04b29c85e63 ]] && have_tsort=1 
    424 fi 
    425  
    426 if [[ $have_tsort = 0 ]]; then 
    427         bmake= 
    428 else 
    429         for x in $bmake $(which mmake) $(which bmake) /usr/bin/make; do 
    430                 bmake= 
    431                 y=$(printf 't:\n\t@echo ${_MIRMAKE_VER}\n' | \ 
    432                     $x -f - t 2>/dev/null) 
    433                 [[ $y = +([0-9]) ]] || continue 
    434                 [[ $y < 20070626 ]] && continue 
    435                 bmake=$x 
    436                 break 
    437         done 
    438 fi 
    439 [[ $bmake = $topdir/lbin/bmake ]] && bmake= 
    440  
    441 if [[ $have_tsort = 0 || -z $bmake ]]; then 
    442         echo USE_TOOLS_MIRMAKE=1 >>$topdir/lbin/prereq.mk 
    443         bmake=$topdir/lbin/bmake 
    444         if ! which mksh >/dev/null 2>&1; then 
    445                 echo USE_TOOLS_MKSH=1 >>$topdir/lbin/prereq.mk 
    446         fi 
    447 fi 
    448  
    449 echo "BMAKE='$bmake'" >>$topdir/lbin/prereq.mk 
    450  
    451 if grep USE_TOOLS_MKSH=1 $topdir/lbin/prereq.mk >/dev/null 2>&1; then 
     418if ! which mksh >/dev/null 2>&1; then 
     419        echo USE_TOOLS_MKSH=1 >>$topdir/lbin/prereq.mk 
    452420        echo "MBSH:=$topdir/lbin/mkshw" >>$topdir/lbin/prereq.mk 
    453421        rm -f $topdir/lbin/mkshw 
    …… 
    461429        EOF 
    462430        chmod +x $topdir/lbin/mkshw 
    463 elif which mksh >/dev/null 2>&1; then 
     431else 
    464432        echo "MBSH:=$(which mksh)" >>$topdir/lbin/prereq.mk 
    465 else 
    466         echo "MBSH:=$${BASH}" >>$topdir/lbin/prereq.mk 
    467433fi 
    468434 

  • trunk/freewrt/tools/Makefile

    r3125 r3182  
    1010 
    1111# These must be first 
    12 TARGETS+=       paxmirabilis 
    13 TARGETS+=       sed 
     12TARGETS+=       paxmirabilis   # all depend on it 
     13TARGETS+=       sed            # most depend on it 
    1414 
    1515# Conditionals 
    …… 
    1717TARGETS+=       mksh 
    1818endif 
    19 ifneq (${USE_TOOLS_MIRMAKE},) 
    2019TARGETS+=       mirmake         # depends on mksh 
    21 endif 
    2220 
    2321TARGETS+=       brcm-utils