From owner-p4-projects@FreeBSD.ORG Fri Sep 19 07:03:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BA9A106567B; Fri, 19 Sep 2008 07:03:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F41C106566B for ; Fri, 19 Sep 2008 07:03:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C9F48FC1B for ; Fri, 19 Sep 2008 07:03:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8J73HZ7077223 for ; Fri, 19 Sep 2008 07:03:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8J73HRu077204 for perforce@freebsd.org; Fri, 19 Sep 2008 07:03:17 GMT (envelope-from imp@freebsd.org) Date: Fri, 19 Sep 2008 07:03:17 GMT Message-Id: <200809190703.m8J73HRu077204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 150091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Sep 2008 07:03:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=150091 Change 150091 by imp@imp_paco-paco on 2008/09/19 07:02:44 Diff reduction to head. Make find work again, and retire the kludge of not building libmagic. Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#23 edit .. //depot/projects/mips2/src/lib/Makefile#15 edit .. //depot/projects/mips2/src/share/mk/bsd.own.mk#12 edit Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#23 (text+ko) ==== @@ -291,14 +291,16 @@ .endif # install stage +IMAKEENV= ${CROSSENV} +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV= ${CROSSENV} \ - PATH=${STRICTTMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ + LD_LIBRARY_PATH=${INSTALLTMP} \ + PATH_LOCALE=${INSTALLTMP}/locale +IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else -IMAKEENV= ${CROSSENV} \ - PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV= PATH=${TMPPATH}:${INSTALLTMP} .endif -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -935,8 +937,6 @@ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ - usr.bin/file2c \ - lib/libsbuf \ usr.sbin/config \ ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ @@ -976,7 +976,8 @@ ${_share} \ ${_aicasm} \ usr.bin/awk \ - + lib/libmagic \ + usr.sbin/sysinstall ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/mips2/src/lib/Makefile#15 (text+ko) ==== @@ -33,7 +33,7 @@ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ ${_libgssapi} ${_librpcsec_gss} libipsec \ - ${_libipx} libkiconv ${_libmagic} libmemstat ${_libmilter} ${_libmp} \ + ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ libpmc libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ @@ -70,10 +70,6 @@ _libipx= libipx .endif -.if ${MK_MAGIC} != "no" && ${MACHINE_ARCH} != "mips" -_libmagic= libmagic -.endif - .if ${MACHINE_ARCH} == "i386" .if ${MK_NCP} != "no" _libncp= libncp ==== //depot/projects/mips2/src/share/mk/bsd.own.mk#12 (text+ko) ==== @@ -328,7 +328,6 @@ LIBTHR \ LOCALES \ LPR \ - MAGIC \ MAILWRAPPER \ MAN \ NCP \