From owner-freebsd-current Fri Jun 19 10:35:32 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id KAA27840 for freebsd-current-outgoing; Fri, 19 Jun 1998 10:35:32 -0700 (PDT) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from shire.domestic.de (kuebart.stuttgart.netsurf.de [194.233.216.182]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA27703 for ; Fri, 19 Jun 1998 10:34:56 -0700 (PDT) (envelope-from joki@kuebart.stuttgart.netsurf.de) Received: from yacht.domestic.de (yacht.domestic.de [192.168.1.4]) by shire.domestic.de (8.8.8/8.8.7) with ESMTP id TAA18058 for ; Fri, 19 Jun 1998 19:34:31 +0200 (CEST) (envelope-from joki@shire.domestic.de) From: Joachim Kuebart Received: (from joki@localhost) by yacht.domestic.de (8.8.8/8.8.7) id VAA28942 for freebsd-current@freebsd.org; Fri, 19 Jun 1998 21:35:50 +0200 (CEST) (envelope-from joki@shire.domestic.de) Message-Id: <199806191935.VAA28942@yacht.domestic.de> Subject: /usr/src/Makefile and ELF buildworld To: freebsd-current@FreeBSD.ORG (FreeBSD Current) Date: Fri, 19 Jun 1998 21:35:49 +0200 (CEST) X-Mailer: ELM [version 2.4ME+ PL32 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Hi, I need those patches against /usr/src/Makefile to make an ELF world. Are they OK? Index: Makefile =================================================================== RCS file: /usr/CVS-Repository/src/Makefile,v retrieving revision 1.203 diff -u -r1.203 Makefile --- Makefile 1998/06/17 09:34:42 1.203 +++ Makefile 1998/06/19 19:28:49 @@ -502,10 +502,11 @@ cd ${.CURDIR}/usr.bin/yacc; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \ ${MAKE} ${MK_FLAGS} all; \ ${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR} +# sh needs the lex libs, so build them! cd ${.CURDIR}/usr.bin/lex; ${MAKE} bootstrap; \ ${MAKE} ${MK_FLAGS} ${_DEPEND}; \ - ${MAKE} ${MK_FLAGS} -DNOLIB all; \ - ${MAKE} ${MK_FLAGS} -DNOLIB -B install ${CLEANDIR} + ${MAKE} ${MK_FLAGS} all; \ + ${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} .if !defined(NOOBJDIR) cd ${.CURDIR}/usr.bin/lex; ${MAKE} ${OBJDIR} .endif @@ -564,9 +565,13 @@ .else cd ${.CURDIR}/lib/libtelnet; ${MAKE} beforeinstall .endif +.if exists(${.CURDIR}/lib/csu/${MACHINE}-${BINFORMAT}) + cd ${.CURDIR}/lib/csu/${MACHINE}-${BINFORMAT}; ${MAKE} beforeinstall +.else .if exists(${.CURDIR}/lib/csu/${MACHINE}) cd ${.CURDIR}/lib/csu/${MACHINE}; ${MAKE} beforeinstall .endif +.endif cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libc; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcalendar; ${MAKE} beforeinstall @@ -661,7 +666,11 @@ .if exists(lib/csu/${MACHINE}.pcc) _csu=lib/csu/${MACHINE}.pcc .else +.if exists(lib/csu/${MACHINE}-${BINFORMAT}) +_csu=lib/csu/${MACHINE}-${BINFORMAT} +.else _csu=lib/csu/${MACHINE} +.endif .endif .if !defined(NOSECURE) && !defined(NOCRYPT) cu Jo --------------------------------------------------------------------- FreeBSD: The Power to Serve Joachim Kuebart Tel: +49 711 653706 Replicants are like any other machine -- Germany they're either a benefit or a hazard. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message