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.
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)
_______________________________________________
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
