From owner-svn-src-all@freebsd.org Thu Aug 25 08:27:13 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 029ADBC5AFE; Thu, 25 Aug 2016 08:27:13 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mail.madpilot.net (grunt.madpilot.net [78.47.145.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B85AE1F3E; Thu, 25 Aug 2016 08:27:12 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mail (mail [192.168.254.3]) by mail.madpilot.net (Postfix) with ESMTP id 3sKcjT4PzWzZqm; Thu, 25 Aug 2016 10:27:09 +0200 (CEST) Received: from mail.madpilot.net ([192.168.254.3]) by mail (mail.madpilot.net [192.168.254.3]) (amavisd-new, port 10024) with ESMTP id 4rLjvVn8yKj3; Thu, 25 Aug 2016 10:27:07 +0200 (CEST) Received: from marvin.madpilot.net (micro.madpilot.net [88.149.173.206]) by mail.madpilot.net (Postfix) with ESMTPSA; Thu, 25 Aug 2016 10:27:07 +0200 (CEST) Subject: Re: svn commit: r303988 - head/lib/libc/gen To: Ed Schouten , Bryan Drewery References: <201608120703.u7C73whf007189@repo.freebsd.org> <9ae1c2eb-02ad-b8fe-6aff-7e17e955607a@FreeBSD.org> <2632f5f8-d765-3df7-74d7-da878eb4b7a8@FreeBSD.org> Cc: svn-src-head@freebsd.org, jilles@freebsd.org, svn-src-all@freebsd.org, src-committers , Ed Schouten From: Guido Falsi Message-ID: <2e308383-bfbb-cccd-cfc2-eba63d275f5e@FreeBSD.org> Date: Thu, 25 Aug 2016 10:27:07 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Aug 2016 08:27:13 -0000 On 08/24/16 21:49, Ed Schouten wrote: > 2016-08-24 20:30 GMT+02:00 Bryan Drewery : >> That would only fix stable/11, stable/10, stable/9, releng/11.0. >> >> It won't fix releng/10.3, releng/10.2, releng/10.1, releng/9.3, etc... >> without an EN. >> >> It won't fix stable/11 - 1, stable/10 - 1, etc. >> >> It will never fix releng/8.4 (unsupported releases) since so@ won't EN >> to those. People do sometimes need to build these older releases still. >> >> It creates a line in the sand where we can never build checkouts older >> than where the fix was at. So I don't think it is the appropriate fix. > > Good point! > > Just for the record: Bryan and I just discussed this matter in more > detail on IRC. We came up with a workaround that should be pretty > good. > > Attached is a patch for that adds some extra logic, so that > any calls to basename() and dirname() will expand to calls to > __old_basename() and __old_dirname(). Using __sym_compat(), these will > cause the compiler to generate calls to basename@FBSD_1.0 and > dirname@FBSD_1.0. > > According to Bryan, this fixes the problems he was experiencing. > I just tried using the attached patch to build a nanobsd image, host is amd64 head at r304773 with this patch applied, target is i386 releng/11.0 at r304729. I've got it failing early during build: --- _bootstrap-tools-usr.bin/xinstall --- xinstall.o: In function `install': /usr/local/nanobsd/rr-trunk/src/usr.bin/xinstall/xinstall.c:(.text+0xf55): undefined reference to `basename@FBSD_1.0' cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [xinstall] Error code 1 make[3]: stopped in /usr/local/nanobsd/rr-trunk/src/usr.bin/xinstall 1 error make[3]: stopped in /usr/local/nanobsd/rr-trunk/src/usr.bin/xinstall *** [_bootstrap-tools-usr.bin/xinstall] Error code 2 Did I miss some needed procedure? Thanks! -- Guido Falsi