diff mbox

Who broke options.h?

Message ID 20170425165856.GH1809@tucnak
State New
Headers show

Commit Message

Jakub Jelinek April 25, 2017, 4:58 p.m. UTC
On Tue, Apr 25, 2017 at 09:54:04AM -0700, Steve Kargl wrote:
> On Tue, Apr 25, 2017 at 05:46:15PM +0200, Andreas Schwab wrote:
> > On Apr 25 2017, Steve Kargl <sgk@troutmask.apl.washington.edu> wrote:
> > 
> > > Someone (other than Richard who seems to have fixed his
> > > bootstrap issue) in the last 3 days has broken bootstrap
> > > on FreeBSD.
> > 
> > Did you change your locale since then?
> > 
> 
> See my reply to Joseph.  It is locale related.  I'm surprised
> I haven't seen this before, which suggests that I must always
> login into my normal account and then su to the gcc/ account.

So like (to follow how we set env vars in other spots):

	* Makefile.in (s-options): Call opt-gather.awk with
	LC_ALL=C in the environment.


?  Untested.

	Jakub

Comments

Joseph Myers April 25, 2017, 5 p.m. UTC | #1
On Tue, 25 Apr 2017, Jakub Jelinek wrote:

> On Tue, Apr 25, 2017 at 09:54:04AM -0700, Steve Kargl wrote:
> > On Tue, Apr 25, 2017 at 05:46:15PM +0200, Andreas Schwab wrote:
> > > On Apr 25 2017, Steve Kargl <sgk@troutmask.apl.washington.edu> wrote:
> > > 
> > > > Someone (other than Richard who seems to have fixed his
> > > > bootstrap issue) in the last 3 days has broken bootstrap
> > > > on FreeBSD.
> > > 
> > > Did you change your locale since then?
> > > 
> > 
> > See my reply to Joseph.  It is locale related.  I'm surprised
> > I haven't seen this before, which suggests that I must always
> > login into my normal account and then su to the gcc/ account.
> 
> So like (to follow how we set env vars in other spots):
> 
> 	* Makefile.in (s-options): Call opt-gather.awk with
> 	LC_ALL=C in the environment.

Yes, assuming this fixes the problem.
Steve Kargl April 25, 2017, 5:18 p.m. UTC | #2
On Tue, Apr 25, 2017 at 06:58:56PM +0200, Jakub Jelinek wrote:
> On Tue, Apr 25, 2017 at 09:54:04AM -0700, Steve Kargl wrote:
> > On Tue, Apr 25, 2017 at 05:46:15PM +0200, Andreas Schwab wrote:
> > > On Apr 25 2017, Steve Kargl <sgk@troutmask.apl.washington.edu> wrote:
> > > 
> > > > Someone (other than Richard who seems to have fixed his
> > > > bootstrap issue) in the last 3 days has broken bootstrap
> > > > on FreeBSD.
> > > 
> > > Did you change your locale since then?
> > > 
> > 
> > See my reply to Joseph.  It is locale related.  I'm surprised
> > I haven't seen this before, which suggests that I must always
> > login into my normal account and then su to the gcc/ account.
> 
> So like (to follow how we set env vars in other spots):
> 
> 	* Makefile.in (s-options): Call opt-gather.awk with
> 	LC_ALL=C in the environment.
> 
> --- gcc/Makefile.in	2017-04-18 21:16:24.703775156 +0200
> +++ gcc/Makefile.in	2017-04-25 18:56:58.304963926 +0200
> @@ -2139,6 +2139,7 @@ s-specs : Makefile
>  
>  optionlist: s-options ; @true
>  s-options: $(ALL_OPT_FILES) Makefile $(srcdir)/opt-gather.awk
> +	LC_ALL=C ; export LC_ALL ; \
>  	$(AWK) -f $(srcdir)/opt-gather.awk $(ALL_OPT_FILES) > tmp-optionlist
>  	$(SHELL) $(srcdir)/../move-if-change tmp-optionlist optionlist
>  	$(STAMP) s-options
> 
> ?  Untested.

I can test this.  However, as this is a change in Makefile.in,
do I need to add --enable-maintainer-mode or some such flag
to configure?
Jakub Jelinek April 25, 2017, 5:20 p.m. UTC | #3
On Tue, Apr 25, 2017 at 10:18:28AM -0700, Steve Kargl wrote:
> > --- gcc/Makefile.in	2017-04-18 21:16:24.703775156 +0200
> > +++ gcc/Makefile.in	2017-04-25 18:56:58.304963926 +0200
> > @@ -2139,6 +2139,7 @@ s-specs : Makefile
> >  
> >  optionlist: s-options ; @true
> >  s-options: $(ALL_OPT_FILES) Makefile $(srcdir)/opt-gather.awk
> > +	LC_ALL=C ; export LC_ALL ; \
> >  	$(AWK) -f $(srcdir)/opt-gather.awk $(ALL_OPT_FILES) > tmp-optionlist
> >  	$(SHELL) $(srcdir)/../move-if-change tmp-optionlist optionlist
> >  	$(STAMP) s-options
> > 
> > ?  Untested.
> 
> I can test this.  However, as this is a change in Makefile.in,
> do I need to add --enable-maintainer-mode or some such flag
> to configure?

No.  Makefile is not included, so it is always (re)generated.

	Jakub
Steve Kargl April 25, 2017, 7:43 p.m. UTC | #4
On Tue, Apr 25, 2017 at 06:58:56PM +0200, Jakub Jelinek wrote:
> On Tue, Apr 25, 2017 at 09:54:04AM -0700, Steve Kargl wrote:
> > On Tue, Apr 25, 2017 at 05:46:15PM +0200, Andreas Schwab wrote:
> > > On Apr 25 2017, Steve Kargl <sgk@troutmask.apl.washington.edu> wrote:
> > > 
> > > > Someone (other than Richard who seems to have fixed his
> > > > bootstrap issue) in the last 3 days has broken bootstrap
> > > > on FreeBSD.
> > > 
> > > Did you change your locale since then?
> > > 
> > 
> > See my reply to Joseph.  It is locale related.  I'm surprised
> > I haven't seen this before, which suggests that I must always
> > login into my normal account and then su to the gcc/ account.
> 
> So like (to follow how we set env vars in other spots):
> 
> 	* Makefile.in (s-options): Call opt-gather.awk with
> 	LC_ALL=C in the environment.
> 
> --- gcc/Makefile.in	2017-04-18 21:16:24.703775156 +0200
> +++ gcc/Makefile.in	2017-04-25 18:56:58.304963926 +0200
> @@ -2139,6 +2139,7 @@ s-specs : Makefile
>  
>  optionlist: s-options ; @true
>  s-options: $(ALL_OPT_FILES) Makefile $(srcdir)/opt-gather.awk
> +	LC_ALL=C ; export LC_ALL ; \
>  	$(AWK) -f $(srcdir)/opt-gather.awk $(ALL_OPT_FILES) > tmp-optionlist
>  	$(SHELL) $(srcdir)/../move-if-change tmp-optionlist optionlist
>  	$(STAMP) s-options
> 
> ?  Untested.
> 

This appears to fix my problem.  Do you want to commit the patch
or would you rather have me do it?  Note, the problem is present
in 7-branch.  I haven't checked the other branches.
Jakub Jelinek April 25, 2017, 7:46 p.m. UTC | #5
On Tue, Apr 25, 2017 at 12:43:00PM -0700, Steve Kargl wrote:
> This appears to fix my problem.  Do you want to commit the patch
> or would you rather have me do it?  Note, the problem is present
> in 7-branch.  I haven't checked the other branches.

Committed to trunk, 7.x will need to wait until 7.1 is released,
the rc1 is already in the works and this isn't anything new,
I see the same thing already in GCC 4.0.

	Jakub
Gerald Pfeifer April 30, 2017, 5:49 p.m. UTC | #6
On Tue, 25 Apr 2017, Jakub Jelinek wrote:
> Committed to trunk, 7.x will need to wait until 7.1 is released, 
> the rc1 is already in the works and this isn't anything new, I 
> see the same thing already in GCC 4.0.

Thanks, Jakub!  Are you planning to apply this to GCC 7 after the
release of 7.1?

And would you mind backporting this to active release branches?
(If not, okay if I do?)

Gerald
Jakub Jelinek April 30, 2017, 6:10 p.m. UTC | #7
On Sun, Apr 30, 2017 at 07:49:45PM +0200, Gerald Pfeifer wrote:
> On Tue, 25 Apr 2017, Jakub Jelinek wrote:
> > Committed to trunk, 7.x will need to wait until 7.1 is released, 
> > the rc1 is already in the works and this isn't anything new, I 
> > see the same thing already in GCC 4.0.
> 
> Thanks, Jakub!  Are you planning to apply this to GCC 7 after the
> release of 7.1?

Yes.

> And would you mind backporting this to active release branches?
> (If not, okay if I do?)

I'll handle it together with other 6.x and 5.x backports of my patches.

	Jakub
diff mbox

Patch

--- gcc/Makefile.in	2017-04-18 21:16:24.703775156 +0200
+++ gcc/Makefile.in	2017-04-25 18:56:58.304963926 +0200
@@ -2139,6 +2139,7 @@  s-specs : Makefile
 
 optionlist: s-options ; @true
 s-options: $(ALL_OPT_FILES) Makefile $(srcdir)/opt-gather.awk
+	LC_ALL=C ; export LC_ALL ; \
 	$(AWK) -f $(srcdir)/opt-gather.awk $(ALL_OPT_FILES) > tmp-optionlist
 	$(SHELL) $(srcdir)/../move-if-change tmp-optionlist optionlist
 	$(STAMP) s-options