From owner-freebsd-stable Thu Sep 27 11:40:38 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 E9CAA37B415; Thu, 27 Sep 2001 11:40:27 -0700 (PDT) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.2/8.11.2) id f8RIe1780989; Thu, 27 Sep 2001 21:40:01 +0300 (EEST) (envelope-from ru) Date: Thu, 27 Sep 2001 21:40:01 +0300 From: Ruslan Ermilov To: Sheldon Hearn Cc: stable@FreeBSD.ORG, Jordan Hubbard Subject: Re: [FIXED] Re: Cross-building and read-only src both broken Message-ID: <20010927214001.B79596@sunbay.com> References: <26311.1000459295@axl.seasidesoftware.co.za> <20010914181314.A48860@sunbay.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010914181314.A48860@sunbay.com>; from ru@FreeBSD.org on Fri, Sep 14, 2001 at 06:13:14PM +0300 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 Hmm, I'm confused as to why it worked before, but now the following is also required for the "standard" buildworld that builds "secure": Index: Makefile.inc1 =================================================================== RCS file: /home/ncvs/src/Makefile.inc1,v retrieving revision 1.218 diff -u -r1.218 Makefile.inc1 --- Makefile.inc1 2001/09/25 12:17:52 1.218 +++ Makefile.inc1 2001/09/27 18:28:46 @@ -677,6 +654,8 @@ cd ${.CURDIR}/kerberosIV/lib/libkdb; ${MAKE} beforeinstall cd ${.CURDIR}/kerberosIV/lib/libkrb; ${MAKE} beforeinstall cd ${.CURDIR}/kerberosIV/lib/libtelnet; ${MAKE} beforeinstall +.elif exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) + cd ${.CURDIR}/secure/lib/libtelnet; ${MAKE} beforeinstall .else cd ${.CURDIR}/lib/libtelnet; ${MAKE} beforeinstall .endif Index: secure/lib/libtelnet/Makefile =================================================================== RCS file: /home/ncvs/src/secure/lib/libtelnet/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- secure/lib/libtelnet/Makefile 2001/08/20 12:32:38 1.25 +++ secure/lib/libtelnet/Makefile 2001/09/27 18:28:46 @@ -15,14 +15,18 @@ INCS= ${TELNETDIR}/arpa/telnet.h INCDIR= /usr/include/arpa +.include + +.PATH: ${TELNETDIR}/libtelnet + # # Remove obsolete shared libraries, if any. We don't bother moving them # to /usr/lib/compat, since they were only used by telnet, telnetd and # tn3270. # -beforeinstall: +beforeinstall: __remove-stale-libs +__remove-stale-libs: .PHONY +.if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0) + -chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 - -.include - -.PATH: ${TELNETDIR}/libtelnet +.endif When "CFLAGS+=-nostdinc ${DESTDIR}/usr/include" magic was in bsd.lib.mk, the result was "-nostdinc -I${TELNETDIR} -I${WORLDTMP}/usr/include", and that picked up the right header from ${TELNETDIR}/arpa. Now, with this magic in Makefile.inc1, "-I${WORLDTMP}/usr/include -I${TELNETDIR}" picks up the wrong header, as we didn't install the correct header. Plus one bug fix. :-) 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