| Message ID | 20240911113134.18920-1-algonell@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Makefile: Fix typos | expand |
On Wed, Sep 11, 2024 at 7:32 AM Andrew Kreimer <algonell@gmail.com> wrote: > > Fix typos in comments. > > Signed-off-by: Andrew Kreimer <algonell@gmail.com> > --- > Makefile.def | 2 +- > Makefile.in | 4 ++-- > Makefile.tpl | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/Makefile.def b/Makefile.def > index 19954e7d731..b502eb63d36 100644 > --- a/Makefile.def > +++ b/Makefile.def > @@ -77,7 +77,7 @@ host_modules= { module= gprofng; }; > host_modules= { module= gettext; bootstrap=true; no_install=true; > module_srcdir= "gettext/gettext-runtime"; > // We always build gettext with pic, because some packages (e.g. gdbserver) > - // need it in some configuratons, which is determined via nontrivial tests. > + // need it in some configurations, which is determined via nontrivial tests. > // Always enabling pic seems to make sense for something tied to > // user-facing output. > extra_configure_flags='--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf'; > diff --git a/Makefile.in b/Makefile.in > index 966d6045496..0c3511d2cf1 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -666,7 +666,7 @@ AR_FOR_TARGET=@AR_FOR_TARGET@ > AS_FOR_TARGET=@AS_FOR_TARGET@ > CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ > > -# If GCC_FOR_TARGET is not overriden on the command line, then this > +# If GCC_FOR_TARGET is not overridden on the command line, then this > # variable is passed down to the gcc Makefile, where it is used to > # build libgcc2.a. We define it here so that it can itself be > # overridden on the command line. > @@ -68937,7 +68937,7 @@ install-gdb: $(INSTALL_GDB_TK) > @serialization_dependencies@ > > # -------------------------------- > -# Regenerating top level configury > +# Regenerating top level configure > # -------------------------------- No, "configury" is correct here. "configure" refers to just the script actually named "configure", while "configury" with a "y" includes all of the helper scripts and stuff that autotools installs to ensure that the configure script can run properly. > > # Rebuilding Makefile.in, using autogen. > diff --git a/Makefile.tpl b/Makefile.tpl > index da38dca697a..b32dd1e4583 100644 > --- a/Makefile.tpl > +++ b/Makefile.tpl > @@ -589,7 +589,7 @@ AR_FOR_TARGET=@AR_FOR_TARGET@ > AS_FOR_TARGET=@AS_FOR_TARGET@ > CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ > > -# If GCC_FOR_TARGET is not overriden on the command line, then this > +# If GCC_FOR_TARGET is not overridden on the command line, then this > # variable is passed down to the gcc Makefile, where it is used to > # build libgcc2.a. We define it here so that it can itself be > # overridden on the command line. > @@ -2129,7 +2129,7 @@ install-gdb: $(INSTALL_GDB_TK) > @serialization_dependencies@ > > # -------------------------------- > -# Regenerating top level configury > +# Regenerating top level configure > # -------------------------------- > > # Rebuilding Makefile.in, using autogen. > -- > 2.46.0 >
On Wed, Sep 11, 2024 at 11:06:40AM -0400, Eric Gallager wrote: > On Wed, Sep 11, 2024 at 7:32 AM Andrew Kreimer <algonell@gmail.com> wrote: > > > > Fix typos in comments. > > > > Signed-off-by: Andrew Kreimer <algonell@gmail.com> > > --- > > Makefile.def | 2 +- > > Makefile.in | 4 ++-- > > Makefile.tpl | 4 ++-- > > 3 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/Makefile.def b/Makefile.def > > index 19954e7d731..b502eb63d36 100644 > > --- a/Makefile.def > > +++ b/Makefile.def > > @@ -77,7 +77,7 @@ host_modules= { module= gprofng; }; > > host_modules= { module= gettext; bootstrap=true; no_install=true; > > module_srcdir= "gettext/gettext-runtime"; > > // We always build gettext with pic, because some packages (e.g. gdbserver) > > - // need it in some configuratons, which is determined via nontrivial tests. > > + // need it in some configurations, which is determined via nontrivial tests. > > // Always enabling pic seems to make sense for something tied to > > // user-facing output. > > extra_configure_flags='--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf'; > > diff --git a/Makefile.in b/Makefile.in > > index 966d6045496..0c3511d2cf1 100644 > > --- a/Makefile.in > > +++ b/Makefile.in > > @@ -666,7 +666,7 @@ AR_FOR_TARGET=@AR_FOR_TARGET@ > > AS_FOR_TARGET=@AS_FOR_TARGET@ > > CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ > > > > -# If GCC_FOR_TARGET is not overriden on the command line, then this > > +# If GCC_FOR_TARGET is not overridden on the command line, then this > > # variable is passed down to the gcc Makefile, where it is used to > > # build libgcc2.a. We define it here so that it can itself be > > # overridden on the command line. > > @@ -68937,7 +68937,7 @@ install-gdb: $(INSTALL_GDB_TK) > > @serialization_dependencies@ > > > > # -------------------------------- > > -# Regenerating top level configury > > +# Regenerating top level configure > > # -------------------------------- > > No, "configury" is correct here. "configure" refers to just the script > actually named "configure", while "configury" with a "y" includes all > of the helper scripts and stuff that autotools installs to ensure that > the configure script can run properly. > My bad! > > > > # Rebuilding Makefile.in, using autogen. > > diff --git a/Makefile.tpl b/Makefile.tpl > > index da38dca697a..b32dd1e4583 100644 > > --- a/Makefile.tpl > > +++ b/Makefile.tpl > > @@ -589,7 +589,7 @@ AR_FOR_TARGET=@AR_FOR_TARGET@ > > AS_FOR_TARGET=@AS_FOR_TARGET@ > > CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ > > > > -# If GCC_FOR_TARGET is not overriden on the command line, then this > > +# If GCC_FOR_TARGET is not overridden on the command line, then this > > # variable is passed down to the gcc Makefile, where it is used to > > # build libgcc2.a. We define it here so that it can itself be > > # overridden on the command line. > > @@ -2129,7 +2129,7 @@ install-gdb: $(INSTALL_GDB_TK) > > @serialization_dependencies@ > > > > # -------------------------------- > > -# Regenerating top level configury > > +# Regenerating top level configure > > # -------------------------------- > > > > # Rebuilding Makefile.in, using autogen. > > -- > > 2.46.0 > >
On Wed, Sep 11, 2024 at 11:24 AM Andrew Kreimer <algonell@gmail.com> wrote: > > On Wed, Sep 11, 2024 at 11:06:40AM -0400, Eric Gallager wrote: > > On Wed, Sep 11, 2024 at 7:32 AM Andrew Kreimer <algonell@gmail.com> wrote: > > > > > > Fix typos in comments. > > > > > > Signed-off-by: Andrew Kreimer <algonell@gmail.com> > > > --- > > > Makefile.def | 2 +- > > > Makefile.in | 4 ++-- > > > Makefile.tpl | 4 ++-- > > > 3 files changed, 5 insertions(+), 5 deletions(-) > > > > > > diff --git a/Makefile.def b/Makefile.def > > > index 19954e7d731..b502eb63d36 100644 > > > --- a/Makefile.def > > > +++ b/Makefile.def > > > @@ -77,7 +77,7 @@ host_modules= { module= gprofng; }; > > > host_modules= { module= gettext; bootstrap=true; no_install=true; > > > module_srcdir= "gettext/gettext-runtime"; > > > // We always build gettext with pic, because some packages (e.g. gdbserver) > > > - // need it in some configuratons, which is determined via nontrivial tests. > > > + // need it in some configurations, which is determined via nontrivial tests. > > > // Always enabling pic seems to make sense for something tied to > > > // user-facing output. > > > extra_configure_flags='--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf'; > > > diff --git a/Makefile.in b/Makefile.in > > > index 966d6045496..0c3511d2cf1 100644 > > > --- a/Makefile.in > > > +++ b/Makefile.in > > > @@ -666,7 +666,7 @@ AR_FOR_TARGET=@AR_FOR_TARGET@ > > > AS_FOR_TARGET=@AS_FOR_TARGET@ > > > CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ > > > > > > -# If GCC_FOR_TARGET is not overriden on the command line, then this > > > +# If GCC_FOR_TARGET is not overridden on the command line, then this > > > # variable is passed down to the gcc Makefile, where it is used to > > > # build libgcc2.a. We define it here so that it can itself be > > > # overridden on the command line. > > > @@ -68937,7 +68937,7 @@ install-gdb: $(INSTALL_GDB_TK) > > > @serialization_dependencies@ > > > > > > # -------------------------------- > > > -# Regenerating top level configury > > > +# Regenerating top level configure > > > # -------------------------------- > > > > No, "configury" is correct here. "configure" refers to just the script > > actually named "configure", while "configury" with a "y" includes all > > of the helper scripts and stuff that autotools installs to ensure that > > the configure script can run properly. > > > > My bad! > It's ok, it's kind of an obscure usage that probably ought to be documented somewhere! Anyways, the rest of the changes look fine to me, although I'm not in a position to approve... > > > > > > # Rebuilding Makefile.in, using autogen. > > > diff --git a/Makefile.tpl b/Makefile.tpl > > > index da38dca697a..b32dd1e4583 100644 > > > --- a/Makefile.tpl > > > +++ b/Makefile.tpl > > > @@ -589,7 +589,7 @@ AR_FOR_TARGET=@AR_FOR_TARGET@ > > > AS_FOR_TARGET=@AS_FOR_TARGET@ > > > CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ > > > > > > -# If GCC_FOR_TARGET is not overriden on the command line, then this > > > +# If GCC_FOR_TARGET is not overridden on the command line, then this > > > # variable is passed down to the gcc Makefile, where it is used to > > > # build libgcc2.a. We define it here so that it can itself be > > > # overridden on the command line. > > > @@ -2129,7 +2129,7 @@ install-gdb: $(INSTALL_GDB_TK) > > > @serialization_dependencies@ > > > > > > # -------------------------------- > > > -# Regenerating top level configury > > > +# Regenerating top level configure > > > # -------------------------------- > > > > > > # Rebuilding Makefile.in, using autogen. > > > -- > > > 2.46.0 > > >
diff --git a/Makefile.def b/Makefile.def index 19954e7d731..b502eb63d36 100644 --- a/Makefile.def +++ b/Makefile.def @@ -77,7 +77,7 @@ host_modules= { module= gprofng; }; host_modules= { module= gettext; bootstrap=true; no_install=true; module_srcdir= "gettext/gettext-runtime"; // We always build gettext with pic, because some packages (e.g. gdbserver) - // need it in some configuratons, which is determined via nontrivial tests. + // need it in some configurations, which is determined via nontrivial tests. // Always enabling pic seems to make sense for something tied to // user-facing output. extra_configure_flags='--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf'; diff --git a/Makefile.in b/Makefile.in index 966d6045496..0c3511d2cf1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -666,7 +666,7 @@ AR_FOR_TARGET=@AR_FOR_TARGET@ AS_FOR_TARGET=@AS_FOR_TARGET@ CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ -# If GCC_FOR_TARGET is not overriden on the command line, then this +# If GCC_FOR_TARGET is not overridden on the command line, then this # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. @@ -68937,7 +68937,7 @@ install-gdb: $(INSTALL_GDB_TK) @serialization_dependencies@ # -------------------------------- -# Regenerating top level configury +# Regenerating top level configure # -------------------------------- # Rebuilding Makefile.in, using autogen. diff --git a/Makefile.tpl b/Makefile.tpl index da38dca697a..b32dd1e4583 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -589,7 +589,7 @@ AR_FOR_TARGET=@AR_FOR_TARGET@ AS_FOR_TARGET=@AS_FOR_TARGET@ CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ -# If GCC_FOR_TARGET is not overriden on the command line, then this +# If GCC_FOR_TARGET is not overridden on the command line, then this # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. @@ -2129,7 +2129,7 @@ install-gdb: $(INSTALL_GDB_TK) @serialization_dependencies@ # -------------------------------- -# Regenerating top level configury +# Regenerating top level configure # -------------------------------- # Rebuilding Makefile.in, using autogen.
Fix typos in comments. Signed-off-by: Andrew Kreimer <algonell@gmail.com> --- Makefile.def | 2 +- Makefile.in | 4 ++-- Makefile.tpl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)