r343111 breaks build

2019-01-17 Thread Lev Serebryakov

 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
 ^
/data/src/contrib/libc++/include/errno.h:56:2: error: unterminated
conditional directive
#ifdef ELAST
 ^
/data/src/contrib/libc++/include/errno.h:52:2: error: unterminated
conditional directive
#if !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) &&
!defined(EINTEGRITY)
 ^
/data/src/contrib/libc++/include/errno.h:36:2: error: unterminated
conditional directive
#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) ||
!defined(EINTEGRITY)
 ^
/data/src/contrib/libc++/include/errno.h:34:2: error: unterminated
conditional directive
#ifdef __cplusplus
 ^
/data/src/contrib/libc++/include/errno.h:11:2: error: unterminated
conditional directive
#ifndef _LIBCPP_ERRNO_H
 ^
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:17:
In file included from
/data/src/contrib/libc++/include/__threading_support:16:
/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
 ^
/data/src/contrib/libc++/include/errno.h:56:2: error: unterminated
conditional directive
#ifdef ELAST
 ^
/data/src/contrib/libc++/include/errno.h:52:2: error: unterminated
conditional directive
#if !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) &&
!defined(EINTEGRITY)
 ^
/data/src/contrib/libc++/include/errno.h:36:2: error: unterminated
conditional directive
#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) ||
!defined(EINTEGRITY)
 ^
/data/src/contrib/libc++/include/errno.h:34:2: error: unterminated
conditional directive
#ifdef __cplusplus
 ^
/data/src/contrib/libc++/include/errno.h:11:2: error: unterminated
conditional directive
#ifndef _LIBCPP_ERRNO_H
 ^


-- 
// Lev Serebryakov



signature.asc
Description: OpenPGP digital signature


Re: r343111 breaks build

2019-01-17 Thread David Wolfskill
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.

Peace,
david
-- 
David H. Wolfskill  da...@catwhisker.org
Trump is more of an "existential" than "potential" threat to US security.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.


signature.asc
Description: PGP signature


Re: r343111 breaks build

2019-01-17 Thread Trond Endrestøl
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"


Re: r343111 breaks build

2019-01-17 Thread Trond Endrestøl
On Thu, 17 Jan 2019 15:53+0100, Trond Endrestøl wrote:

> Try the attached patch, [...]

I fail to see how r343113 actually fixes r343111.

Attached patch augments and corrects the changes done in r343113.

-- 
Trond.Index: contrib/libc++/include/errno.h
===
--- contrib/libc++/include/errno.h  (revision 343114)
+++ contrib/libc++/include/errno.h  (working copy)
@@ -56,6 +56,7 @@
 #if defined(ELAST)
 #undef ELAST
 #define ELAST EINTEGRITY
+#endif
 
 #elif !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY)
 #define ENOTRECOVERABLE __elast1
@@ -63,6 +64,7 @@
 #if defined(ELAST)
 #undef ELAST
 #define ELAST EOWNERDEAD
+#endif
 
 #elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY)
 #define EOWNERDEAD __elast1
@@ -70,6 +72,7 @@
 #if defined(ELAST)
 #undef ELAST
 #define ELAST EINTEGRITY
+#endif
 
 #elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && defined(EINTEGRITY)
 #define EOWNERDEAD __elast1
@@ -76,6 +79,7 @@
 #if defined(ELAST)
 #undef ELAST
 #define ELAST EOWNERDEAD
+#endif
 
 #elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY)
 #define ENOTRECOVERABLE __elast1
@@ -83,6 +87,7 @@
 #if defined(ELAST)
 #undef ELAST
 #define ELAST EINTEGRITY
+#endif
 
 #elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY)
 #define ENOTRECOVERABLE __elast1
@@ -89,6 +94,7 @@
 #if defined(ELAST)
 #undef ELAST
 #define ELAST ENOTRECOVERABLE
+#endif
 
 #elif defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY)
 #define EINTEGRITY __elast1
@@ -95,6 +101,7 @@
 #if defined(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"


Re: r343111 breaks build

2019-01-17 Thread David Wolfskill
On Thu, Jan 17, 2019 at 03:53:03PM +0100, Trond Endrestøl wrote:
> 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):
> ...
> > > /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:
> ...

That patch worked for me:

FreeBSD freebeast.catwhisker.org 13.0-CURRENT FreeBSD 13.0-CURRENT #438 
r343111M/343111: Thu Jan 17 08:02:08 PST 2019 
r...@freebeast.catwhisker.org:/common/S4/obj/usr/src/amd64.amd64/sys/GENERIC  
amd64

Thanks!

(Sorry about the delay; there was also an llvm change)

Peace,
david
-- 
David H. Wolfskill  da...@catwhisker.org
Trump is more of an "existential" than "potential" threat to US security.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.


signature.asc
Description: PGP signature


UEFI, loader.efi and /boot.config

2019-01-17 Thread Rebecca Cran

With a recent change I made for UEFI, we now install loader.efi onto the ESP 
and don’t run boot1. That means that /boot.config is no longer read, and so 
console settings need to be put in /boot/loader.conf. 
I was wondering if people will expect /boot.config to still be read and so code 
should be added to loader to continue to parse it, or if loader.conf can be 
considered the correct place and boot.config forgotten about?

— 
Rebecca Cran
___
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"


Re: UEFI, loader.efi and /boot.config

2019-01-17 Thread David Wolfskill
On Thu, Jan 17, 2019 at 07:31:38PM -0700, Rebecca Cran wrote:
> 
> With a recent change I made for UEFI, we now install loader.efi onto the ESP 
> and don’t run boot1. That means that /boot.config is no longer read, and so 
> console settings need to be put in /boot/loader.conf. 
> I was wondering if people will expect /boot.config to still be read and so 
> code should be added to loader to continue to parse it, or if loader.conf can 
> be considered the correct place and boot.config forgotten about?
> 

Does the above only apply to UEFI booting, or also to booting from
BIOS/MBR?

If the latter, I'd be OK with the change as long as it's adequately
publicized ahead of time (e.g., a src/UPDATING entry & -- ideally -- a
"heads-up" in current@).

If the former, I'm less opinionated: none of my personal machines boot
UEFI.  I'd tend to assume that changing to UEFI will involve some
(other) changes to how I do things anyway.  (My build machine uses
/boot.config to default to "verbose" booting, dual-console.)

Peace,
david
-- 
David H. Wolfskill  da...@catwhisker.org
Trump is more of an "existential" than "potential" threat to US security.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.


signature.asc
Description: PGP signature


Re: UEFI, loader.efi and /boot.config

2019-01-17 Thread Warner Losh
On Thu, Jan 17, 2019, 7:33 PM Rebecca Cran 
> With a recent change I made for UEFI, we now install loader.efi onto the
> ESP and don’t run boot1. That means that /boot.config is no longer read,
> and so console settings need to be put in /boot/loader.conf.
> I was wondering if people will expect /boot.config to still be read and so
> code should be added to loader to continue to parse it, or if loader.conf
> can be considered the correct place and boot.config forgotten about?
>

The problem is that by the time we know what / is. It's too late. If there
is an error before that. It's kinda too late. Since it is too late, you
should just set the console with loader.conf, since it is the standard
place. I think it can be forgotten for these and other reasons...
loader.conf is a superset of boot.conf anyway.

Warnet

—
> Rebecca Cran
> ___
> 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"
>
___
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"


Re: UEFI, loader.efi and /boot.config

2019-01-17 Thread Kurt Jaeger
Hi!

> With a recent change I made for UEFI, we now install loader.efi onto the ESP 
> and don???t run boot1. That means that /boot.config is no longer read, and so 
> console settings need to be put in /boot/loader.conf

Which change is that ?

> I was wondering if people will expect /boot.config to still be read and so 
> code should be added to loader to continue to parse it, or if loader.conf can 
> be considered the correct place and boot.config forgotten about?

I have quite a few systems using /boot.config, but can cope if I know about 
this.

-- 
p...@opsec.eu+49 171 3101372One year to go !
___
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"