From eugen@grosbein.pp.ru  Sun Apr 22 12:57:01 2012
Return-Path: <eugen@grosbein.pp.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6D830106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Apr 2012 12:57:01 +0000 (UTC)
	(envelope-from eugen@grosbein.pp.ru)
Received: from grosbein.pp.ru (grosbein.pp.ru [89.189.172.146])
	by mx1.freebsd.org (Postfix) with ESMTP id 783AB8FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Apr 2012 12:56:59 +0000 (UTC)
Received: from grosbein.pp.ru (localhost [127.0.0.1])
	by grosbein.pp.ru (8.14.5/8.14.5) with ESMTP id q3MChB40003368
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Apr 2012 19:43:11 +0700 (NOVT)
	(envelope-from eugen@grosbein.pp.ru)
Received: (from eugen@localhost)
	by grosbein.pp.ru (8.14.5/8.14.5/Submit) id q3MChB4u003367;
	Sun, 22 Apr 2012 19:43:11 +0700 (NOVT)
	(envelope-from eugen)
Message-Id: <201204221243.q3MChB4u003367@grosbein.pp.ru>
Date: Sun, 22 Apr 2012 19:43:11 +0700 (NOVT)
From: Eugene Grosbein <eugen@grosbein.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: source upgrade from RELENG_7 to RELENG_8 broken for no reason
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         167200
>Category:       misc
>Synopsis:       [patch] source upgrade from RELENG_7 to RELENG_8 broken for no reason
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 22 13:00:26 UTC 2012
>Closed-Date:    Sun Apr 20 00:16:13 UTC 2014
>Last-Modified:  Sun Apr 20 00:16:20 UTC 2014
>Originator:     Eugene Grosbein
>Release:        FreeBSD 8.3-PRERELEASE amd64
>Organization:
RDTC JSC
>Environment:
System: FreeBSD grosbein.pp.ru 8.3-PRERELEASE FreeBSD 8.3-PRERELEASE #19: Tue Mar 20 03:24:04 NOVT 2012 root@grosbein.pp.ru:/usr/local/obj/usr/local/src/sys/DADV amd64

>Description:

	src/lib/libc/stdlib/Makefile.inc use '.sinclude' directive
	that's not supported by make(1) of RELENG_7, so make buildworld
	fails while one performs source upgrade from 7.4-STABLE to 8.3-STABLE.

	This breakage is easily fixed by applying to RELENG_8 reversed
	version of patch:

http://www.freebsd.org/cgi/cvsweb.cgi/src/lib/libc/stdlib/Makefile.inc.diff?r1=1.56;r2=1.57

	Please make this 'no-op' change to save users from extra cycle
	in the chain 7.4-STABLE -> 8.0-RELEASE -> 8-STABLE.

	Or, perform MFC to RELENG_8 of recent make(1) sources that supporrt
	'.sinclude' directive.

>How-To-Repeat:

	Try to make buildworld of RELENG_8 sources using 7.4 machine.

>Fix:

	Apply this to RELENG_8:

--- lib/libc/stdlib/Makefile.inc.orig	2012-04-22 17:56:26.000000000 +0700
+++ lib/libc/stdlib/Makefile.inc	2012-04-22 17:56:26.000000000 +0700
@@ -16,7 +16,9 @@
 SYM_MAPS+= ${.CURDIR}/stdlib/Symbol.map
 
 # machine-dependent stdlib sources
-.sinclude "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc"
+.endif
 
 MAN+=	a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \
 	div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 \
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Sun Apr 20 00:14:01 UTC 2014 
State-Changed-Why:  
I'm sorry that this PR got neglected.  Since it has been submitted, 
FreeBSD 7 has gone EOL, so this PR is no longer relevant. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167200 
>Unformatted:
