Changeset 2222

Show
Ignore:
Timestamp:
03/21/07 20:19:44 (2 years ago)
Author:
tg
Message:

• revert the addition of “build gmake as part of tools“, it had too

many problems

• for now, gmake 3.81 IS REQUIRED
• clean up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/Makefile

    r2208 r2222  
    2323 
    2424config: .prereq_done 
    25         @${GMAKE_INV} FWRTPREREQ=1 config 
     25        @${GMAKE_INV} config 
    2626 
    2727oldconfig: .prereq_done 
    28         @${GMAKE_INV} FWRTPREREQ=1 oldconfig 
     28        @${GMAKE_INV} oldconfig 
    2929 
    3030cleandir: .prereq_done 
    …… 
    4242 
    4343menuconfig: .prereq_done 
    44         @${GMAKE_INV} FWRTPREREQ=1 menuconfig 
     44        @${GMAKE_INV} menuconfig 
    4545 
    4646allnoconfig: .prereq_done 
    47         @${GMAKE_INV} FWRTPREREQ=1 allnoconfig 
     47        @${GMAKE_INV} allnoconfig 
    4848 
    4949allmodconfig: .prereq_done 
    50         @${GMAKE_INV} FWRTPREREQ=1 allmodconfig 
     50        @${GMAKE_INV} allmodconfig 
    5151 
    5252snapshotconfig: .prereq_done 
    53         @${GMAKE_INV} FWRTPREREQ=1 snapshotconfig 
     53        @${GMAKE_INV} snapshotconfig 
    5454 
    5555package_index: .prereq_done 
    …… 
    135135                chmod 555 lbin/gcc; \ 
    136136        fi 
    137         @${GMAKE_INV} FWRTPREREQ=1 tools/install-lbin 
     137        @${GMAKE_INV} tools/install-lbin 
    138138        @echo '===> Prerequisites checked successfully.' 
    139139        @touch $@ 

  • trunk/freewrt/rules.mk

    r2213 r2222  
    7373UNAME_S:=               Linux 
    7474 
    75 ifeq (${FWRTPREREQ},) 
    76 include ${TOPDIR}/mk/uname.mk 
    77 endif # not FWRTPREREQ 
     75ifeq ($(strip ${FWRT_LINUX_2_4_BRCM}),y) 
     76UNAME_R:=               2.4.34 
     77else ifeq ($(strip ${FWRT_LINUX_2_6_BRCM}),y) 
     78UNAME_R:=               2.6.19.1 
     79else ifeq ($(strip ${FWRT_LINUX_2_4_RB}),y) 
     80UNAME_R:=               2.4.34 
     81else ifeq ($(strip ${FWRT_LINUX_2_6_RB}),y) 
     82UNAME_R:=               2.6.19.1 
     83else ifeq ($(strip ${FWRT_LINUX_2_6_X86}),y) 
     84UNAME_R:=               2.6.19.1 
     85else 
     86$(error Cannot determine target "uname -r" output) 
     87endif 
     88 
     89ifeq ($(strip ${FWRT_mipsel}),y) 
     90UNAME_M:=               mips 
     91else ifeq ($(strip ${FWRT_i386}),y) 
     92UNAME_M:=               i386 
     93else 
     94$(error Cannot determine target "uname -m" output) 
     95endif 
    7896 
    7997export UNAME_S UNAME_R UNAME_M 

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

    r2220 r2222  
    198198        out=1 
    199199fi 
    200 rm -f $topdir/lbin/gmake_vok 
    201200if (( (major < 3) || ((major == 3) && (minor < 81)) )); then 
    202         echo GNU make $major.$minor too old. Building gmake 3.81 later. 
    203 else 
    204         echo vok=1 >$topdir/lbin/gmake_vok 
     201        echo GNU make $major.$minor too old. 
     202        echo Please install GNU make 3.81 or higher to continue. 
     203        echo 
     204        out=1 
    205205fi 
    206206 

  • trunk/freewrt/tools/Makefile

    r2208 r2222  
    55# or at http://www.freewrt.org/licence for details. 
    66 
    7 FWRTPREREQ=1 
    87include $(TOPDIR)/rules.mk 
    98 
    …… 
    1211# These must be first 
    1312TARGETS+=       paxmirabilis 
    14 TARGETS+=       gmake 
    1513TARGETS+=       sed 
    1614 

  • trunk/freewrt/tools/paxmirabilis/Makefile

    r2208 r2222  
    55# or at http://www.freewrt.org/licence for details. 
    66 
    7 FWRTPREREQ=1 
    87include $(TOPDIR)/rules.mk 
    98