Changeset 2950

Show
Ignore:
Timestamp:
06/26/07 21:15:59 (1 year ago)
Author:
tg
Message:

I'm somehow sorry for re-rolling the mirmake distfile, but bugs suck.
rm dl/mirmake*gz if you fell into the time hole (i.e. rebuilt within
the last hour or so)

this fixes compilation and cross-compilation much better, and also
moves the version check into make prereq

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/vars.mk

    r2949 r2950  
    2424BSDMAKE_FLAGS+=         NONBINMODE=0644 CONFGRP=${BUILD_GROUP} INSTALL_STRIP= 
    2525BSDMAKE_FLAGS+=         MACHINE=${ARCH} MACHINE_ARCH=${ARCH} NOMAN=Yes 
    26 BSDMAKE_FLAGS+=         RTLD_TYPE=GNU MKC_DEBG=y 
     26BSDMAKE_FLAGS+=         RTLD_TYPE=GNU STRIP=: 
    2727BSDMAKE=                env MAKEFLAGS=V=99 MFLAGS= BSDOBJDIR='${BUILD_DIR}' \ 
    2828                        LD='${TARGET_CROSS}ld' ${BMAKE} ${BSDMAKE_FLAGS} 

  • trunk/freewrt/package/openssl/Makefile

    r2944 r2950  
    4141endif 
    4242 
    43 pre-configure: 
    44         x=$$(${BSDMAKE} -f /dev/null ___DISPLAY_MAKEVARS=_MIRMAKE_VER); \ 
    45         ([[ $$x < 20070626 ]] && { \ 
    46                 echo >&2 'Error: your mirmake is too old!'; \ 
    47                 false; \ 
    48         } || :) 
    49  
    5043post-install: 
    5144        cd ${WRKSRC}/tinclude && ${PCP} openssl ${WRKINST}/usr/include/ 

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

    r2930 r2950  
    395395fi 
    396396 
    397 for x in $bmake $(which mmake) $(which bmake) /usr/bin/make; do 
     397if [[ $have_tsort = 0 ]]; then 
    398398        bmake= 
    399         y=$(printf 't:\n\t@echo ${NONBINMODE}\n.include <bsd.own.mk>\n' | \ 
    400             $x -f - t 2>/dev/null) 
    401         [[ $y = *@(444|644)* ]] || continue 
    402         bmake=$x 
    403         break 
    404 done 
     399else 
     400        for x in $bmake $(which mmake) $(which bmake) /usr/bin/make; do 
     401                bmake= 
     402                y=$(printf 't:\n\t@echo ${_MIRMAKE_VER}\n' | \ 
     403                    $x -f - t 2>/dev/null) 
     404                [[ $y < 20070626 ]] && continue 
     405                bmake=$x 
     406                break 
     407        done 
     408fi 
     409[[ $bmake = $topdir/lbin/bmake ]] && bmake= 
    405410 
    406411if [[ $have_tsort = 0 || -z $bmake ]]; then 

  • trunk/freewrt/tools/mirmake/Makefile

    r2946 r2950  
    77PKG_NAME=               mirmake 
    88PKG_VERSION=            20070626 
    9 PKG_RELEASE=            2 
    10 PKG_MD5SUM=             a0d5c4b5b1aa096fa84b37599080b799 
     9PKG_RELEASE=            3 
     10PKG_MD5SUM=             11327c85e3ca13d541553c777a0d7481 
    1111DISTFILES=              ${PKG_NAME}-${PKG_VERSION}.cpio.gz 
    1212MASTER_SITES=           ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/make/}