Date: Wed, 24 Aug 2016 21:49:29 +0200 From: Ed Schouten <ed@nuxi.nl> To: Bryan Drewery <bdrewery@freebsd.org> Cc: svn-src-head@freebsd.org, jilles@freebsd.org, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org>, Ed Schouten <ed@freebsd.org> Subject: Re: svn commit: r303988 - head/lib/libc/gen Message-ID: <CABh_MKm_YQ3bJD19Cz1vBCGr=YxuzctXV6F1iqMASkSx-PsVMw@mail.gmail.com> In-Reply-To: <2632f5f8-d765-3df7-74d7-da878eb4b7a8@FreeBSD.org> References: <201608120703.u7C73whf007189@repo.freebsd.org> <d23b295a-1902-193c-dee6-ba49ebd77280@FreeBSD.org> <9ae1c2eb-02ad-b8fe-6aff-7e17e955607a@FreeBSD.org> <CABh_MKkxD3OTF7VO9Rq_eZyqHPN%2BxVws3q3dsH2R3DfZ343kFw@mail.gmail.com> <2632f5f8-d765-3df7-74d7-da878eb4b7a8@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--94eb2c06a37a61b2b6053ad69491 Content-Type: text/plain; charset=UTF-8 2016-08-24 20:30 GMT+02:00 Bryan Drewery <bdrewery@freebsd.org>: > 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 <libgen.h> 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 <ed@nuxi.nl> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CABh_MKm_YQ3bJD19Cz1vBCGr=YxuzctXV6F1iqMASkSx-PsVMw>