Date: Tue, 5 Nov 2013 22:26:08 -0500 From: Julio Merino <julio@meroh.net> To: Garrett Cooper <yaneurabeya@gmail.com> Cc: Rui Paulo <rpaulo@fnop.net>, freebsd-testing@freebsd.org Subject: Re: Fixing the build with TESTS Message-ID: <CADyfeQURZxUPGvwF%2Bd6YMxXqrxiCuk79oRCs1s6z_GrUn_Qe5g@mail.gmail.com> In-Reply-To: <CAGHfRMDLCKvTXpYUYQWZu64qpeqATkzwH_Yc7%2BZRXSh%2BxWyiNw@mail.gmail.com> References: <CADyfeQW4GwhKgg4P8OWELnGWvDO8mvSjjo7Og3WMk2uxAGBGoA@mail.gmail.com> <CAGHfRMDLCKvTXpYUYQWZu64qpeqATkzwH_Yc7%2BZRXSh%2BxWyiNw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--089e0115fe1e0eb79504ea79b73b Content-Type: text/plain; charset=ISO-8859-1 On Tue, Nov 05, 2013 at 05:52:29PM -0800, Garrett Cooper wrote: > I fixed this on my branch some time ago. See this patch for more > details (from http://lists.freebsd.org/pipermail/freebsd-toolchain/2013-April/000804.html > ) : http://lists.freebsd.org/pipermail/freebsd-toolchain/attachments/20130424/c44daa61/attachment.obj > . > > If you change the former patch to refer to lib/atf instead of > lib/atf/libatf-c, things will just work too is the order is properly > specified in lib/atf :). > > I've attached entire up-to-date patch set, just for simplicity. I like your approach more. However, it seems that your change to bsd.own.mk could be better handled by the existing NO_* functionality, couldn't it? Updated the two patches and descriptions accordingly. Please take another look! --089e0115fe1e0eb79504ea79b73b Content-Type: text/x-diff; charset=us-ascii; name="fix-build-all-atf.diff" Content-Disposition: attachment; filename="fix-build-all-atf.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: b6c564a9ff829e83_0.1 QWRkIGxpYmF0Zi1jKysgdG8gdGhlIHByZWJ1aWxkIGxpYnMuDQoNClNvbWUgdGVzdHMgbWF5IHJl cXVpcmUgQysrIHNvIHdlIG11c3QgZW5zdXJlIHRoaXMgbGlicmFyeSBleGlzdHMgYXMgcGFydA0K b2YgdGhlIGJvb3RzdHJhcCBwcm9jZXNzIG9yIGVsc2UgdGhleSB3aWxsIGZhaWwgdG8gYnVpbGQu ICBEbyB0aGlzIGJ5DQpqdXN0IGRlcGVuZGluZyBvbiBsaWIvYXRmIGFzIHBhcnQgb2YgdGhlIGJv b3RzdHJhcCBsaWJyYXJpZXMgaW5zdGVhZCBvZg0KdXNpbmcgbGliL2F0Zi9saWJhdGYtYy4NCg0K U3VibWl0dGVkIGJ5OglHYXJyZXR0IENvb3BlciA8eWFuZXVyYWJleWEgYXQgZ21haWwgZG90IGNv bT4NCg0KSW5kZXg6IGhlYWQvTWFrZWZpbGUuaW5jMQ0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIGhlYWQub3Jp Zy9NYWtlZmlsZS5pbmMxDQorKysgaGVhZC9NYWtlZmlsZS5pbmMxDQpAQCAtMTQ4OCw3ICsxNDg4 LDcgQEAgX3ByZWJ1aWxkX2xpYnM9CSR7X2tlcmJlcm9zNV9saWJfbGliYXNuMQ0KIAkJJHtfa2Vy YmVyb3M1X2xpYl9saWJoeDUwOX0gJHtfa2VyYmVyb3M1X2xpYl9saWJrcmI1fSBcDQogCQkke19r ZXJiZXJvczVfbGliX2xpYnJva2VufSBcDQogCQkke19rZXJiZXJvczVfbGliX2xpYndpbmR9IFwN Ci0JCSR7X2xpYl9hdGZfbGliYXRmX2N9IFwNCisJCSR7X2xpYl9hdGZ9IFwNCiAJCWxpYi9saWJi ejIgJHtfbGliY29tX2Vycn0gbGliL2xpYmNyeXB0IFwNCiAJCWxpYi9saWJlbGYgbGliL2xpYmV4 cGF0IFwNCiAJCSR7X2xpYl9saWJnc3NhcGl9ICR7X2xpYl9saWJpcHh9IFwNCkBAIC0xNTAzLDcg KzE1MDMsNyBAQCBfcHJlYnVpbGRfbGlicz0JJHtfa2VyYmVyb3M1X2xpYl9saWJhc24xDQogCQkk e19zZWN1cmVfbGliX2xpYnNzaH0gJHtfc2VjdXJlX2xpYl9saWJzc2x9DQogDQogLmlmICR7TUtf QVRGfSAhPSAibm8iDQotX2xpYl9hdGZfbGliYXRmX2M9CWxpYi9hdGYvbGliYXRmLWMNCitfbGli X2F0Zj0JbGliL2F0Zg0KIC5lbmRpZg0KIA0KIC5pZiAke01LX0xJQlRIUn0gIT0gIm5vIg0K --089e0115fe1e0eb79504ea79b73b Content-Type: text/x-diff; charset=us-ascii; name="fix-build-bootstrap.diff" Content-Disposition: attachment; filename="fix-build-bootstrap.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: b6c564a9ff829e83_0.3 Rml4IGJ1aWxkd29ybGQgd2hlbiBXSVRIX1RFU1RTIGlzIGVuYWJsZWQuDQoNClRoZSBhZGRpdGlv biBvZiB0aGUgVEVTVFMga25vYiBhbmQgaXRzIGVuYWJsaW5nIG9mIHRoZSBidWlsZCBvZiB0ZXN0 cyBpbg0KbGliL2xpYmNyeXB0L3Rlc3RzLyBicm9rZSB0aGUgYnVpbGQuICBUaGUgcmVhc29uIGlz IHRoYXQgd2UgY2Fubm90IGRlc2NlbmQNCmludG8gdGVzdHMvIHN1YmRpcmVjdG9yaWVzIHVudGls IGFsbCBwcmVyZXF1aXNpdGVzIGhhdmUgYmVlbiBidWlsdCwgd2hpY2gNCmluIHRoZSBjYXNlIG9m IHRlc3RzIG1heSBiZSAiYSBsb3Qgb2YgdGhpbmdzIiAobGliYXRmLWMgaW4gdGhpcyBjYXNlKS4N Cg0KRW5zdXJlIHRoYXQgd2UgZG8gbm90IHdhbGsgdGVzdHMvIGRpcmVjdG9yaWVzIGR1cmluZyB0 aGUgYm9vdHN0cmFwcGluZyBvZg0KdGhlIGxpYnJhcmllcyBhcyBwYXJ0IG9mIGJ1aWxkd29ybGQu DQoNClN1Ym1pdHRlZCBieToJR2FycmV0dCBDb29wZXIgPHlhbmV1cmFiZXlhIGF0IGdtYWlsIGRv dCBjb20+DQoNCkluZGV4OiBoZWFkL01ha2VmaWxlLmluYzENCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBoZWFk Lm9yaWcvTWFrZWZpbGUuaW5jMQ0KKysrIGhlYWQvTWFrZWZpbGUuaW5jMQ0KQEAgLTI0Niw3ICsy NDYsNyBAQCBCTUFLRT0JCU1BS0VPQkpESVJQUkVGSVg9JHtXT1JMRFRNUH0gXA0KIAkJU1NQX0NG TEFHUz0gXA0KIAkJLURXSVRIT1VUX0hUTUwgLURXSVRIT1VUX0lORk8gLUROT19MSU5UIC1EV0lU SE9VVF9NQU4gXA0KIAkJLUROT19QSUMgLUROT19QUk9GSUxFIC1ETk9fU0hBUkVEIFwNCi0JCS1E Tk9fQ1BVX0NGTEFHUyAtRE5PX1dBUk5TIC1ETk9fQ1RGIC1ERUFSTFlfQlVJTEQNCisJCS1ETk9f Q1BVX0NGTEFHUyAtRE5PX1dBUk5TIC1ETk9fQ1RGIC1ERUFSTFlfQlVJTEQgLUROT19URVNUUw0K IA0KICMgYnVpbGQtdG9vbHMgc3RhZ2UNCiBUTUFLRT0JCU1BS0VPQkpESVJQUkVGSVg9JHtPQkpU UkVFfSBcDQpAQCAtMjU2LDEyICsyNTYsMTIgQEAgVE1BS0U9CQlNQUtFT0JKRElSUFJFRklYPSR7 T0JKVFJFRX0gXA0KIAkJQk9PVFNUUkFQUElORz0ke09TUkVMREFURX0gXA0KIAkJU1NQX0NGTEFH Uz0gXA0KIAkJLUROT19MSU5UIFwNCi0JCS1ETk9fQ1BVX0NGTEFHUyAtRE5PX1dBUk5TIC1ETk9f Q1RGIC1ERUFSTFlfQlVJTEQNCisJCS1ETk9fQ1BVX0NGTEFHUyAtRE5PX1dBUk5TIC1ETk9fQ1RG IC1ERUFSTFlfQlVJTEQgLUROT19URVNUUw0KIA0KICMgY3Jvc3MtdG9vbHMgc3RhZ2UNCiBYTUFL RT0JCVRPT0xTX1BSRUZJWD0ke1dPUkxEVE1QfSAke0JNQUtFfSBcDQogCQlUQVJHRVQ9JHtUQVJH RVR9IFRBUkdFVF9BUkNIPSR7VEFSR0VUX0FSQ0h9IFwNCi0JCS1EV0lUSE9VVF9HREINCisJCS1E V0lUSE9VVF9HREIgLUROT19URVNUUw0KIA0KICMgd29ybGQgc3RhZ2UNCiBXTUFLRUVOVj0JJHtD Uk9TU0VOVn0gXA0KQEAgLTM5OSw3ICszOTksOCBAQCBMSUIzMldNQUtFRkxBR1MrPQlcDQogCQkt RExJQlJBUklFU19PTkxZIFwNCiAJCS1ETk9fQ1BVX0NGTEFHUyBcDQogCQktRE5PX0NURiBcDQot CQktRE5PX0xJTlQNCisJCS1ETk9fTElOVCBcDQorCQktRE5PX1RFU1RTDQogDQogTElCMzJXTUFL RT0JJHtMSUIzMldNQUtFRU5WfSAke01BS0V9ICR7TElCMzJXTUFLRUZMQUdTfSBcDQogCQktRFdJ VEhPVVRfTUFOIC1EV0lUSE9VVF9JTkZPIC1EV0lUSE9VVF9IVE1MDQpAQCAtNTYzLDcgKzU2NCw3 IEBAIF9saWJyYXJpZXM6DQogCUBlY2hvICItLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSINCiAJJHtfK199Y2QgJHsuQ1VSRElSfTsg XA0KIAkgICAgJHtXTUFLRX0gLUROT19GU0NIRyAtRFdJVEhPVVRfSFRNTCAtRFdJVEhPVVRfSU5G TyAtRE5PX0xJTlQgXA0KLQkgICAgLURXSVRIT1VUX01BTiAtRE5PX1BST0ZJTEUgbGlicmFyaWVz DQorCSAgICAtRFdJVEhPVVRfTUFOIC1ETk9fUFJPRklMRSAtRE5PX1RFU1RTIGxpYnJhcmllcw0K IF9kZXBlbmQ6DQogCUBlY2hvDQogCUBlY2hvICItLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSINCkBAIC0xODY2LDcgKzE4NjcsNyBA QCBYREVWX0NQVVRZUEU/PSR7VEFSR0VUX0NQVVRZUEV9DQogDQogTk9GVU49LUROT19GU0NIRyAt RFdJVEhPVVRfSFRNTCAtRFdJVEhPVVRfSU5GTyAtRE5PX0xJTlQgXA0KIAktRFdJVEhPVVRfTUFO IC1EV0lUSE9VVF9OTFMgLUROT19QUk9GSUxFIFwNCi0JLURXSVRIT1VUX0tFUkJFUk9TIC1EV0lU SE9VVF9SRVNDVUUgLUROT19XQVJOUyBcDQorCS1EV0lUSE9VVF9LRVJCRVJPUyAtRFdJVEhPVVRf UkVTQ1VFIC1ETk9fVEVTVFMgLUROT19XQVJOUyBcDQogCVRBUkdFVD0ke1hERVZ9IFRBUkdFVF9B UkNIPSR7WERFVl9BUkNIfSBcDQogCUNQVVRZUEU9JHtYREVWX0NQVVRZUEV9DQogDQpJbmRleDog aGVhZC9zaGFyZS9tay9ic2Qub3duLm1rDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gaGVhZC5vcmlnL3NoYXJl L21rL2JzZC5vd24ubWsNCisrKyBoZWFkL3NoYXJlL21rL2JzZC5vd24ubWsNCkBAIC0yMjcsNyAr MjI3LDggQEAgQ09NUFJFU1NfRVhUPz0JLmd6DQogICAgIERFQlVHX0ZJTEVTIFwNCiAgICAgSU5T VEFMTExJQiBcDQogICAgIE1BTiBcDQotICAgIFBST0ZJTEUNCisgICAgUFJPRklMRSBcDQorICAg IFRFU1RTDQogLmlmIGRlZmluZWQoTk9fJHt2YXJ9KQ0KIC5pZiBkZWZpbmVkKFdJVEhfJHt2YXJ9 KQ0KIC51bmRlZiBXSVRIXyR7dmFyfQ0K --089e0115fe1e0eb79504ea79b73b--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADyfeQURZxUPGvwF%2Bd6YMxXqrxiCuk79oRCs1s6z_GrUn_Qe5g>