From owner-freebsd-stable Fri Sep 14 8:14:35 2001 Delivered-To: freebsd-stable@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id 0AD6637B40D; Fri, 14 Sep 2001 08:14:10 -0700 (PDT) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.2/8.11.2) id f8EFDEH49877; Fri, 14 Sep 2001 18:13:14 +0300 (EEST) (envelope-from ru) Date: Fri, 14 Sep 2001 18:13:14 +0300 From: Ruslan Ermilov To: Sheldon Hearn Cc: stable@FreeBSD.ORG, Jordan Hubbard Subject: [FIXED] Re: Cross-building and read-only src both broken Message-ID: <20010914181314.A48860@sunbay.com> References: <26311.1000459295@axl.seasidesoftware.co.za> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <26311.1000459295@axl.seasidesoftware.co.za>; from sheldonh@starjuice.net on Fri, Sep 14, 2001 at 11:21:35AM +0200 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, Sep 14, 2001 at 11:21:35AM +0200, Sheldon Hearn wrote: > > Hi folks, > > Two problems: > > 1) Cross-building RELENG_4 on a -CURRENT box is broken. > This simple set of patches makes RELENG_4 buildworld and buildkernel succeed on my -CURRENT box. mk_cmds(1) was deleted from -CURRENT as part of the libss removal. Hence it should go to bootstrap-tools (yes, bootstrap-tools can also be used for backwards bootstrapping). Index: Makefile.inc1 =================================================================== RCS file: /home/ncvs/src/Makefile.inc1,v retrieving revision 1.141.2.31 diff -u -p -r1.141.2.31 Makefile.inc1 --- Makefile.inc1 2001/08/17 22:47:13 1.141.2.31 +++ Makefile.inc1 2001/09/14 15:07:23 @@ -568,6 +568,7 @@ _strfile= games/fortune/strfile bootstrap-tools: .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef usr.bin/xinstall \ + usr.bin/mk_cmds \ usr.sbin/config \ gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo cd ${.CURDIR}/${_tool}; \ This makes `build-tools' target to build the necessary headers rather than rely on compatible headers to be available in /usr/include. This should be fixed in -CURRENT as well, I'll be committing this patch shortly into -CURRENT. Index: lib/libncurses/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libncurses/Makefile,v retrieving revision 1.39.2.9 diff -u -p -r1.39.2.9 Makefile --- lib/libncurses/Makefile 2001/06/14 10:56:09 1.39.2.9 +++ lib/libncurses/Makefile 2001/09/14 15:07:39 @@ -326,10 +326,10 @@ term.h: MKterm.h.awk edit_cfg.sh Caps # Build tools build-tools: make_hash make_keys -make_keys: make_keys.c names.c curses.h ncurses_def.h +make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${CC} -o $@ ${CFLAGS} ${NCURSES}/ncurses/tinfo/make_keys.c -make_hash: comp_hash.c hashsize.h curses.h ncurses_def.h +make_hash: comp_hash.c hashsize.h ncurses_def.h ${HEADERS} ${CC} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ ${NCURSES}/ncurses/tinfo/comp_hash.c We need to MFC revision 1.2 -- is not available in -CURRENT. We need to do this only because this is the build tool. Index: share/syscons/scrnmaps/mkscrfil.c =================================================================== RCS file: /home/ncvs/src/share/syscons/scrnmaps/mkscrfil.c,v retrieving revision 1.1 diff -u -p -r1.1 mkscrfil.c --- share/syscons/scrnmaps/mkscrfil.c 1994/09/25 03:41:43 1.1 +++ share/syscons/scrnmaps/mkscrfil.c 2001/09/14 15:07:39 @@ -22,10 +22,12 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #include -#include +#include #include #include FIL Question to the release engineer. May I commit these? Cheers, -- Ruslan Ermilov Oracle Developer/DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message