From owner-svn-src-head@freebsd.org Wed Aug 24 19:49:31 2016 Return-Path: Delivered-To: svn-src-head@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 78C59BC55CD for ; Wed, 24 Aug 2016 19:49:31 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-yw0-x22a.google.com (mail-yw0-x22a.google.com [IPv6:2607:f8b0:4002:c05::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 343531F8C for ; Wed, 24 Aug 2016 19:49:31 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mail-yw0-x22a.google.com with SMTP id r9so16775395ywg.0 for ; Wed, 24 Aug 2016 12:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuxi-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=AI8t05xJ9BjzkKo0otQFwWiYyr6sGpaQw/G4aACa2y4=; b=xRO/ibND1jHmAC5Neaulz6QPdoAjwCKkc9dDfzwKsWDg2n3XdqXUwdReO1E4SZTwYR WJOpIhkmx7Q3rqezDI/n/S08wHN6sFmpkoKVyN46f5uvFfeiLCxpIHHMihlc6D2i9ToP Ro9/XLGhtpDGt4aJoYvIdu6JR93raDMTquRni+bWKnityZtXh0KlacYebL7WDBQFIRA+ gWbA1aS8ydn7PL9vyMtbU2RyceU6G1UOvs1rSwTtBTbrcsq1qN0T8ZDwRzNyh5EpE6ku Dx7AUVI87D+kMan1bqrqkZN9etiWUVH79FoLKYqR/QawTf9kc7ZfXtG8/aPopwK8M339 hAEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=AI8t05xJ9BjzkKo0otQFwWiYyr6sGpaQw/G4aACa2y4=; b=kr6DH3rVVtIcngys1TSqK65ajybg0l2RdMv8iHMQHzc9wX3Mfo0gZFI6AIYqj5k19g 7oChS4NcnuZJ+HobJ0m7tnU/ct0ZtzDHXjc3XU+dUBAXj2OdIZs/JYw2va5cQXsZmAnK x2d5+xhq29BRrPdIYiHegPhIHQkd4Oy3uw2M++0gIR3B4yKZUpgv31IZxQD5BiqBBQxn sO36ZXJRuPt4johczKPB66aSez9NapPr76rWyk3jAjhJ+Oz0AcTs0ZnT7A5LOPoRJ6nG 5y4fEskKzCI74qzGldZ9yCvo7JWX0LVfe/jlTwgepxT7n+n9SUyIuKvrEXNBEXm4xbbt /v6g== X-Gm-Message-State: AE9vXwOZeQ28sj1VSVHXWCmUZW2QcS40zgeJZvsPtJhyX2GSEnyjkI+ZUQjIp1RJqZ7GRY9oSb/25x9Mg9P0vA== X-Received: by 10.13.253.134 with SMTP id n128mr3918534ywf.20.1472068170373; Wed, 24 Aug 2016 12:49:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.13.201.71 with HTTP; Wed, 24 Aug 2016 12:49:29 -0700 (PDT) In-Reply-To: <2632f5f8-d765-3df7-74d7-da878eb4b7a8@FreeBSD.org> References: <201608120703.u7C73whf007189@repo.freebsd.org> <9ae1c2eb-02ad-b8fe-6aff-7e17e955607a@FreeBSD.org> <2632f5f8-d765-3df7-74d7-da878eb4b7a8@FreeBSD.org> From: Ed Schouten Date: Wed, 24 Aug 2016 21:49:29 +0200 Message-ID: Subject: Re: svn commit: r303988 - head/lib/libc/gen To: Bryan Drewery Cc: svn-src-head@freebsd.org, jilles@freebsd.org, svn-src-all@freebsd.org, src-committers , Ed Schouten Content-Type: multipart/mixed; boundary=94eb2c06a37a61b2b6053ad69491 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2016 19:49:31 -0000 --94eb2c06a37a61b2b6053ad69491 Content-Type: text/plain; charset=UTF-8 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. -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK-nr.: 62051717 --94eb2c06a37a61b2b6053ad69491 Content-Type: text/plain; charset=US-ASCII; name="dirname-basename-xinstall.diff" Content-Disposition: attachment; filename="dirname-basename-xinstall.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_is9b4puu1 SW5kZXg6IGluY2x1ZGUvbGliZ2VuLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gaW5jbHVkZS9saWJnZW4uaAko cmV2aXNpb24gMzA0NzUwKQorKysgaW5jbHVkZS9saWJnZW4uaAkod29ya2luZyBjb3B5KQpAQCAt MzksNCArMzksMjYgQEAKIGNoYXIJKmRpcm5hbWUoY2hhciAqKTsKIF9fRU5EX0RFQ0xTCiAKKy8q CisgKiBJbiBGcmVlQlNEIDEyLCB0aGUgcHJvdG90eXBlIG9mIGJhc2VuYW1lKCkgYW5kIGRpcm5h bWUoKSB3YXMgbW9kaWZpZWQKKyAqIHRvIGNvbXBseSB0byBQT1NJWC4gVGhlc2UgZnVuY3Rpb25z IG1heSBub3cgbW9kaWZ5IHRoZWlyIGlucHV0LgorICogVW5mb3J0dW5hdGVseSwgb3VyIGNvcHkg b2YgeGluc3RhbGwoOCkgc2hpcHBlZCB3aXRoIHByZXZpb3VzIHZlcnNpb25zCisgKiBvZiBGcmVl QlNEIGlzIGJ1aWx0IHVzaW5nIHRoZSBob3N0IGhlYWRlcnMgYW5kIGxpYmMgZHVyaW5nIHRoZQor ICogYm9vdHN0cmFwcGluZyBwaGFzZSBhbmQgZGVwZW5kcyBvbiB0aGUgb2xkIGJlaGF2aW9yLgor ICoKKyAqIEFwcGx5IGEgd29ya2Fyb3VuZCB3aGVyZSB3ZSBleHBsaWNpdGx5IGxpbmsgYWdhaW5z dCBiYXNlbmFtZUBGQlNEXzEuMAorICogYW5kIGRpcm5hbWVARkJTRF8xLjAgaW4gY2FzZSB0aGVz ZSBmdW5jdGlvbnMgYXJlIGNhbGxlZCBvbiBjb25zdGFudAorICogc3RyaW5ncywgaW5zdGVhZCBv ZiBtYWtpbmcgdGhlIGJ1aWxkIGZhaWwuCisgKi8KKyNpZiBkZWZpbmVkKF9fZ2VuZXJpYykgJiYg IWRlZmluZWQoX19jcGx1c3BsdXMpCitfX0JFR0lOX0RFQ0xTCitjaGFyCSpfX29sZF9iYXNlbmFt ZShjb25zdCBjaGFyICopOworY2hhcgkqX19vbGRfZGlybmFtZShjb25zdCBjaGFyICopOworX19F TkRfREVDTFMKK19fc3ltX2NvbXBhdChiYXNlbmFtZSwgX19vbGRfYmFzZW5hbWUsIEZCU0RfMS4w KTsKK19fc3ltX2NvbXBhdChkaXJuYW1lLCBfX29sZF9kaXJuYW1lLCBGQlNEXzEuMCk7CisjZGVm aW5lCWJhc2VuYW1lKHgpCV9fZ2VuZXJpYyh4LCBjb25zdCBjaGFyICosIF9fb2xkX2Jhc2VuYW1l LCBiYXNlbmFtZSkoeCkKKyNkZWZpbmUJZGlybmFtZSh4KQlfX2dlbmVyaWMoeCwgY29uc3QgY2hh ciAqLCBfX29sZF9kaXJuYW1lLCBkaXJuYW1lKSh4KQorI2VuZGlmCisKICNlbmRpZiAvKiAhX0xJ QkdFTl9IXyAqLwpJbmRleDogbGliL2xpYmMvZ2VuL2Jhc2VuYW1lLmMKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g bGliL2xpYmMvZ2VuL2Jhc2VuYW1lLmMJKHJldmlzaW9uIDMwNDc1MCkKKysrIGxpYi9saWJjL2dl bi9iYXNlbmFtZS5jCSh3b3JraW5nIGNvcHkpCkBAIC02Niw3ICs2Niw3IEBACiB9CiAKIGNoYXIg KgotYmFzZW5hbWUoY2hhciAqcGF0aCkKKyhiYXNlbmFtZSkoY2hhciAqcGF0aCkKIHsKIAlzdGF0 aWMgY2hhciAqYm5hbWUgPSBOVUxMOwogCkluZGV4OiBsaWIvbGliYy9nZW4vZGlybmFtZS5jCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIGxpYi9saWJjL2dlbi9kaXJuYW1lLmMJKHJldmlzaW9uIDMwNDc1MCkKKysr IGxpYi9saWJjL2dlbi9kaXJuYW1lLmMJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcgKzMxLDcgQEAK ICNpbmNsdWRlIDxzdHJpbmcuaD4KIAogY2hhciAqCi1kaXJuYW1lKGNoYXIgKnBhdGgpCisoZGly bmFtZSkoY2hhciAqcGF0aCkKIHsKIAljb25zdCBjaGFyICppbiwgKnByZXYsICpiZWdpbiwgKmVu ZDsKIAljaGFyICpvdXQ7Cg== --94eb2c06a37a61b2b6053ad69491--