Date: Thu, 17 Jan 2019 15:53:03 +0100 (CET) From: =?ISO-8859-1?Q?Trond_Endrest=F8l?= <Trond.Endrestol@fagskolen.gjovik.no> To: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: r343111 breaks build Message-ID: <alpine.BSF.2.21.9999.1901171547170.25281@mail.fig.ol.no> In-Reply-To: <20190117124908.GL1142@albert.catwhisker.org> References: <31f270cd-ea9b-d71b-8e0c-a3ec3386666c@FreeBSD.org> <20190117124908.GL1142@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --2055831798-599523858-1547736784=:25281 Content-Type: text/plain; charset=US-ASCII On Thu, 17 Jan 2019 04:49-0800, David Wolfskill wrote: > On Thu, Jan 17, 2019 at 03:37:16PM +0300, Lev Serebryakov wrote: > > > > I can not build CURRENT r343111 on r343022 world. Looks like r343111 > > itself cause problems (r343110 builds): > > > > In file included from /data/src/contrib/libc++/src/algorithm.cpp:11: > > In file included from /data/src/contrib/libc++/include/random:1646: > > In file included from /data/src/contrib/libc++/include/istream:163: > > In file included from /data/src/contrib/libc++/include/ostream:138: > > In file included from /data/src/contrib/libc++/include/ios:216: > > In file included from /data/src/contrib/libc++/include/__locale:18: > > In file included from /data/src/contrib/libc++/include/mutex:191: > > In file included from /data/src/contrib/libc++/include/__mutex_base:16: > > In file included from /data/src/contrib/libc++/include/system_error:146: > > In file included from /data/src/contrib/libc++/include/__errc:106: > > In file included from /data/src/contrib/libc++/include/cerrno:27: > > /data/src/contrib/libc++/include/errno.h:70:2: error: unterminated > > conditional directive > > #ifdef ELAST > > ^ > > /data/src/contrib/libc++/include/errno.h:63:2: error: unterminated > > conditional directive > > #ifdef ELAST > > ^ > > ... > > Confirmed (though in my case, I'm building on r343088, and I did not try > building r343110). I did see the above failure on both my build machine > and my laptop. Try the attached patch, repeated here in case it gets munched by mailman: Index: contrib/libc++/include/errno.h =================================================================== --- contrib/libc++/include/errno.h (revision 343111) +++ contrib/libc++/include/errno.h (working copy) @@ -56,6 +56,7 @@ #ifdef ELAST #undef ELAST #define ELAST EINTEGRITY +#endif #elif !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 @@ -63,6 +64,7 @@ #ifdef ELAST #undef ELAST #define ELAST EOWNERDEAD +#endif #elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define EOWNERDEAD __elast1 @@ -70,6 +72,7 @@ #ifdef ELAST #undef ELAST #define ELAST EINTEGRITY +#endif #elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define EOWNERDEAD __elast1 @@ -76,6 +79,7 @@ #ifdef ELAST #undef ELAST #define ELAST EOWNERDEAD +#endif #elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 @@ -83,6 +87,7 @@ #ifdef ELAST #undef ELAST #define ELAST EINTEGRITY +#endif #elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 @@ -89,6 +94,7 @@ #ifdef ELAST #undef ELAST #define ELAST ENOTRECOVERABLE +#endif #elif defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define EINTEGRITY __elast1 @@ -95,6 +101,7 @@ #ifdef ELAST #undef ELAST #define ELAST EINTEGRITY +#endif #endif // !defined(OWNERDEAD) && !defined(NOTRECOVERABLE) && !defined(INTEGRITY) -- Trond. --2055831798-599523858-1547736784=:25281 Content-Type: text/plain; name=r343111.diff.txt Content-Transfer-Encoding: BASE64 Content-ID: <alpine.BSF.2.21.9999.1901171553030.25281@mail.fig.ol.no> Content-Description: Patch for contrib/libc++/include/errno.h after r343111 Content-Disposition: attachment; filename=r343111.diff.txt SW5kZXg6IGNvbnRyaWIvbGliYysrL2luY2x1ZGUvZXJybm8uaA0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQ0KLS0tIGNvbnRyaWIvbGliYysrL2luY2x1ZGUv ZXJybm8uaAkocmV2aXNpb24gMzQzMTExKQ0KKysrIGNvbnRyaWIvbGliYysr L2luY2x1ZGUvZXJybm8uaAkod29ya2luZyBjb3B5KQ0KQEAgLTU2LDYgKzU2 LDcgQEANCiAjaWZkZWYgRUxBU1QNCiAjdW5kZWYgRUxBU1QNCiAjZGVmaW5l IEVMQVNUIEVJTlRFR1JJVFkNCisjZW5kaWYNCiANCiAjZWxpZiAhZGVmaW5l ZChFT1dORVJERUFEKSAmJiAhZGVmaW5lZChFTk9UUkVDT1ZFUkFCTEUpICYm IGRlZmluZWQoRUlOVEVHUklUWSkNCiAjZGVmaW5lIEVOT1RSRUNPVkVSQUJM RSBfX2VsYXN0MQ0KQEAgLTYzLDYgKzY0LDcgQEANCiAjaWZkZWYgRUxBU1QN CiAjdW5kZWYgRUxBU1QNCiAjZGVmaW5lIEVMQVNUIEVPV05FUkRFQUQNCisj ZW5kaWYNCiANCiAjZWxpZiAhZGVmaW5lZChFT1dORVJERUFEKSAmJiBkZWZp bmVkKEVOT1RSRUNPVkVSQUJMRSkgJiYgIWRlZmluZWQoRUlOVEVHUklUWSkN CiAjZGVmaW5lIEVPV05FUkRFQUQgX19lbGFzdDENCkBAIC03MCw2ICs3Miw3 IEBADQogI2lmZGVmIEVMQVNUDQogI3VuZGVmIEVMQVNUDQogI2RlZmluZSBF TEFTVCBFSU5URUdSSVRZDQorI2VuZGlmDQogDQogI2VsaWYgIWRlZmluZWQo RU9XTkVSREVBRCkgJiYgZGVmaW5lZChFTk9UUkVDT1ZFUkFCTEUpICYmIGRl ZmluZWQoRUlOVEVHUklUWSkNCiAjZGVmaW5lIEVPV05FUkRFQUQgX19lbGFz dDENCkBAIC03Niw2ICs3OSw3IEBADQogI2lmZGVmIEVMQVNUDQogI3VuZGVm IEVMQVNUDQogI2RlZmluZSBFTEFTVCBFT1dORVJERUFEDQorI2VuZGlmDQog DQogI2VsaWYgZGVmaW5lZChFT1dORVJERUFEKSAmJiAhZGVmaW5lZChFTk9U UkVDT1ZFUkFCTEUpICYmICFkZWZpbmVkKEVJTlRFR1JJVFkpDQogI2RlZmlu ZSBFTk9UUkVDT1ZFUkFCTEUgX19lbGFzdDENCkBAIC04Myw2ICs4Nyw3IEBA DQogI2lmZGVmIEVMQVNUDQogI3VuZGVmIEVMQVNUDQogI2RlZmluZSBFTEFT VCBFSU5URUdSSVRZDQorI2VuZGlmDQogDQogI2VsaWYgZGVmaW5lZChFT1dO RVJERUFEKSAmJiAhZGVmaW5lZChFTk9UUkVDT1ZFUkFCTEUpICYmIGRlZmlu ZWQoRUlOVEVHUklUWSkNCiAjZGVmaW5lIEVOT1RSRUNPVkVSQUJMRSBfX2Vs YXN0MQ0KQEAgLTg5LDYgKzk0LDcgQEANCiAjaWZkZWYgRUxBU1QNCiAjdW5k ZWYgRUxBU1QNCiAjZGVmaW5lIEVMQVNUIEVOT1RSRUNPVkVSQUJMRQ0KKyNl bmRpZg0KIA0KICNlbGlmIGRlZmluZWQoRU9XTkVSREVBRCkgJiYgZGVmaW5l ZChFTk9UUkVDT1ZFUkFCTEUpICYmICFkZWZpbmVkKEVJTlRFR1JJVFkpDQog I2RlZmluZSBFSU5URUdSSVRZIF9fZWxhc3QxDQpAQCAtOTUsNiArMTAxLDcg QEANCiAjaWZkZWYgRUxBU1QNCiAjdW5kZWYgRUxBU1QNCiAjZGVmaW5lIEVM QVNUIEVJTlRFR1JJVFkNCisjZW5kaWYNCiANCiAjZW5kaWYgLy8gIWRlZmlu ZWQoT1dORVJERUFEKSAmJiAhZGVmaW5lZChOT1RSRUNPVkVSQUJMRSkgJiYg IWRlZmluZWQoSU5URUdSSVRZKQ0KIA0K --2055831798-599523858-1547736784=:25281--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.21.9999.1901171547170.25281>