Changeset 2930

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

build bsd stuff with bsd tools, now that we have them anyway

requires to re-run “make prereq”

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/Makefile

    r2858 r2930  
    176176        @echo "PATH:=\$${TOPDIR}/lbin:$$PATH" >>lbin/prereq.mk 
    177177        @echo "SHELL:=$$(lbin/which bash)" >>lbin/prereq.mk 
     178        @env NO_ERROR=${NO_ERROR} BASH="$$(lbin/which bash)" \ 
     179            CC='${CC}' CPPFLAGS='${CPPFLAGS}' \ 
     180            bash ${_PX} scripts/scan-tools.sh 
    178181        @TOPDIR=$$(readlink -nf .); \ 
    179182            printf '%s\n%s\nwq\n' ",g#$$TOPDIR#s##\$${TOPDIR}#g" \ 
    180183            "1s#^.*\$$#TOPDIR:=$$TOPDIR#" | ed -s lbin/prereq.mk 
    181         @env NO_ERROR=${NO_ERROR} BASH="$$(lbin/which bash)" \ 
    182             CC='${CC}' CPPFLAGS='${CPPFLAGS}' \ 
    183             bash ${_PX} scripts/scan-tools.sh 
    184184        @cc='${CC}'; if test x"$$cc" = x"gcc"; then \ 
    185185                ln -s $$(lbin/which "$$cc") lbin/gcc; \ 

  • trunk/freewrt/mk/pkg-bottom.mk

    r2844 r2930  
    6767            --disable-debug \ 
    6868            ${CONFIGURE_ARGS} 
     69else ifeq ($(filter-out bsd,${CONFIGURE_STYLE}),) 
     70        cd ${WRKBUILD} && ${BSDMAKE} obj 
    6971else ifeq ($(filter-out manual,${CONFIGURE_STYLE}),) 
    7072        env ${CONFIGURE_ENV} ${MAKE} do-configure 
    …… 
    8486ifneq ($(filter auto,${BUILD_STYLE}),) 
    8587        cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ 
     88            ${MAKE_FLAGS} ${ALL_TARGET} 
     89else ifeq ($(filter-out bsd,${BUILD_STYLE}),) 
     90        cd ${WRKBUILD} && env ${MAKE_ENV} ${BSDMAKE} -f ${MAKE_FILE} \ 
    8691            ${MAKE_FLAGS} ${ALL_TARGET} 
    8792else ifeq ($(filter-out manual,${BUILD_STYLE}),) 
    …… 
    105110ifneq ($(filter auto,${INSTALL_STYLE}),) 
    106111        cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ 
     112            DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} 
     113else ifeq ($(filter-out bsd,${BUILD_STYLE}),) 
     114        @mkdir -p ${WRKINST}/{,usr/}{bin,include,lib,sbin} 
     115        cd ${WRKBUILD} && env ${MAKE_ENV} ${BSDMAKE} -f ${MAKE_FILE} \ 
    107116            DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} 
    108117else ifeq ($(filter-out manual,${INSTALL_STYLE}),) 

  • trunk/freewrt/mk/vars.mk

    r2921 r2930  
    1515INSTALL_SCRIPT=         install -m0755 
    1616MAKEFLAGS=              V=99 $(EXTRA_MAKEFLAGS) 
     17BUILD_USER=             $(shell id -un) 
     18BUILD_GROUP=            $(shell id -gn) 
     19BSDMAKE_FLAGS+=         BINOWN=${BUILD_USER} BINGRP=${BUILD_GROUP} 
     20BSDMAKE_FLAGS+=         LIBOWN=${BUILD_USER} LIBGRP=${BUILD_GROUP} 
     21BSDMAKE_FLAGS+=         SHAREOWN=${BUILD_USER} SHAREGRP=${BUILD_GROUP} 
     22BSDMAKE_FLAGS+=         MANOWN=${BUILD_USER} MANGRP=${BUILD_GROUP} 
     23BSDMAKE_FLAGS+=         DOCOWN=${BUILD_USER} DOCGRP=${BUILD_GROUP} 
     24BSDMAKE_FLAGS+=         NONBINMODE=0644 CONFGRP=${BUILD_GROUP} INSTALL_STRIP= 
     25BSDMAKE=                env MAKEFLAGS=V=99 MFLAGS= BSDOBJDIR='${BUILD_DIR}' \ 
     26                        LD='${TARGET_CROSS}ld' ${BMAKE} ${BSDMAKE_FLAGS} 
    1727 
    1828TARGET_CFLAGS:=         $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) 

  • trunk/freewrt/package/gettext/Makefile

    r2904 r2930  
    2828 
    2929ifeq ($(strip ${FWRT_PACKAGE_LIBINTL}),) 
    30 do-build: 
    31         cd ${WRKBUILD} && ${TARGET_CC} -I. ${TCPPFLAGS} \ 
    32             ${TCFLAGS} ${TLDFLAGS} -shared -Wl,-soname,libintl.so.8 \ 
    33             -o libintl.so.8.0.1 nointl.c 
     30CONFIGURE_STYLE=        bsd 
     31BUILD_STYLE=            bsd 
     32INSTALL_STYLE=          bsd 
     33XAKE_FLAGS+=            LIB=intl SHLIB_VERSION=8.0 \ 
     34                        SHLIB_SONAME=libintl.so.8.0.1 
    3435 
    35 do-install: 
    36         mkdir -p ${WRKINST}/usr/{include,lib} 
     36post-install: 
    3737        cp ${WRKSRC}/libintl.h ${WRKINST}/usr/include/ 
    38         cp ${WRKBUILD}/libintl.so.8.0.1 ${WRKINST}/usr/lib/ 
    39         cd ${WRKINST}/usr/lib && ln -s libintl.so.8.0.1 libintl.so.8 
    40         cd ${WRKINST}/usr/lib && ln -s libintl.so.8.0.1 libintl.so 
    4138        cd ${WRKINST} && ${PCP} usr/lib/*.so.* ${IDIR_GETTEXT}/ 
    4239else 

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

    r2866 r2930  
    3939opath=$PATH 
    4040out=0 
     41bmake= 
    4142 
    4243if [[ $NO_ERROR != @(0|1) ]]; then 
    …… 
    7071            <$topdir/scripts/uname.fake >$topdir/lbin/uname 
    7172        chmod 555 $topdir/lbin/uname 
     73        bmake=/usr/bin/make 
    7274        ;; 
    7375*) 
    …… 
    393395fi 
    394396 
    395 if [[ $have_tsort=0 ]]; then 
     397for x in $bmake $(which mmake) $(which bmake) /usr/bin/make; do 
     398        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 
     404done 
     405 
     406if [[ $have_tsort = 0 || -z $bmake ]]; then 
    396407        echo USE_TOOLS_MIRMAKE=1 >>$topdir/lbin/prereq.mk 
     408        bmake=$topdir/lbin/bmake 
    397409        if ! which mksh >/dev/null 2>&1; then 
    398410                echo USE_TOOLS_MKSH=1 >>$topdir/lbin/prereq.mk 
    399411        fi 
    400412fi 
     413 
     414echo "BMAKE='$bmake'" >>$topdir/lbin/prereq.mk 
    401415 
    402416