From joe@storm.FreeBSD.org.uk Sat Oct  2 02:21:29 1999
Return-Path: <joe@storm.FreeBSD.org.uk>
Received: from storm.FreeBSD.org.uk (storm.freebsd.org.uk [194.242.128.198])
	by hub.freebsd.org (Postfix) with ESMTP id BE89914F90
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  2 Oct 1999 02:21:19 -0700 (PDT)
	(envelope-from joe@storm.FreeBSD.org.uk)
Received: (from joe@localhost)
	by storm.FreeBSD.org.uk (8.9.3/8.9.3) id KAA10111;
	Sat, 2 Oct 1999 10:21:19 +0100 (BST)
	(envelope-from joe)
Message-Id: <199910020921.KAA10111@storm.FreeBSD.org.uk>
Date: Sat, 2 Oct 1999 10:21:19 +0100 (BST)
From: joe@FreeBSD.org.uk
Sender: joe@storm.FreeBSD.org.uk
Reply-To: joe@pavilion.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: Some includes weren't being force-linked.
X-Send-Pr-Version: 3.2

>Number:         14085
>Category:       i386
>Synopsis:       Some includes weren't being force-linked.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct  2 02:30:00 PDT 1999
>Closed-Date:    Tue Oct 5 00:39:14 PDT 1999
>Last-Modified:  Tue Oct  5 00:40:16 PDT 1999
>Originator:     Joe Karthauser
>Release:        FreeBSD 3.3-STABLE i386
>Organization:
Pavilion Internet plc/FreeBSD UK
>Environment:
>Description:

	Going through the include/Makefile some include files get
	installed with an 'ln -sf' and some with an 'ln -s'.  In
	particular the i386/include files aren't forced. This means
	if there's a local copy of a header file  we'll never
	overwrite it, leading to potential problems.  In my case
	the problem was caused by a stray i4b_X.h header file that
	had got there from a manual install.

>How-To-Repeat:
>Fix:
	
	Any reason why we can't apply this patch?


Index: Makefile
===================================================================
RCS file: /home/ncvs/src/include/Makefile,v
retrieving revision 1.92.2.2
diff -u -r1.92.2.2 Makefile
--- Makefile	1999/08/29 14:38:49	1.92.2.2
+++ Makefile	1999/10/02 09:13:12
@@ -112,9 +112,9 @@
 	@${ECHO} "Setting up symlinks to kernel source tree..."
 .for i in ${LDIRS} ${LNOHEADERDIRS}
 	rm -rf ${DESTDIR}/usr/include/$i
-	ln -s ../../sys/$i ${DESTDIR}/usr/include/$i
+	ln -sf ../../sys/$i ${DESTDIR}/usr/include/$i
 .endfor
 	rm -rf ${DESTDIR}/usr/include/machine
-	ln -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine
+	ln -sf ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine
 
 .include <bsd.prog.mk>


>Release-Note:
>Audit-Trail:

From: Sheldon Hearn <sheldonh@uunet.co.za>
To: joe@pavilion.net
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: i386/14085: Some includes weren't being force-linked. 
Date: Mon, 04 Oct 1999 12:21:14 +0200

 On Sat, 02 Oct 1999 10:21:19 +0100, joe@FreeBSD.org.uk wrote:
 
 >  .for i in ${LDIRS} ${LNOHEADERDIRS}
 >  	rm -rf ${DESTDIR}/usr/include/$i
 > -	ln -s ../../sys/$i ${DESTDIR}/usr/include/$i
 > +	ln -sf ../../sys/$i ${DESTDIR}/usr/include/$i
 >  .endfor
 
 Are you sure this is necessary, given the ``rm -rf''?
 
 Ciao,
 Sheldon.
 

From: Josef Karthauser <joe@pavilion.net>
To: Sheldon Hearn <sheldonh@uunet.co.za>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: i386/14085: Some includes weren't being force-linked.
Date: Mon, 4 Oct 1999 11:46:47 +0100

 On Mon, Oct 04, 1999 at 12:21:14PM +0200, Sheldon Hearn wrote:
 > 
 > 
 > On Sat, 02 Oct 1999 10:21:19 +0100, joe@FreeBSD.org.uk wrote:
 > 
 > >  .for i in ${LDIRS} ${LNOHEADERDIRS}
 > >  	rm -rf ${DESTDIR}/usr/include/$i
 > > -	ln -s ../../sys/$i ${DESTDIR}/usr/include/$i
 > > +	ln -sf ../../sys/$i ${DESTDIR}/usr/include/$i
 > >  .endfor
 > 
 > Are you sure this is necessary, given the ``rm -rf''?
 > 
 
 Probably not - it was a late late late night.  Let me check :)
 
 Joe
 -- 
 Josef Karthauser	FreeBSD: How many times have you booted today?
 Technical Manager	Viagra for your server (http://www.uk.freebsd.org)
 Pavilion Internet plc.  [joe@pavilion.net, joe@uk.freebsd.org, joe@tao.org.uk]
 
State-Changed-From-To: open->closed 
State-Changed-By: sheldonh 
State-Changed-When: Tue Oct 5 00:39:14 PDT 1999 
State-Changed-Why:  
Files are ``rm -rf''d first. Not a problem. :-) 
>Unformatted:
