[build] Link genmatch with $(LIBINTL)

[build] Link genmatch with $(LIBINTL)

[Rainer Orth]

[-- Attachment #1: Type: text/plain, Size: 739 bytes --]

With the match-and-simply patch, Solaris 10 bootstrap is broken:

Undefined                       first referenced
 symbol                             in file
libintl_bindtextdomain              ../libcpp/libcpp.a(init.o)
libintl_dgettext                    ../libcpp/libcpp.a(errors.o)
ld: fatal: symbol referencing errors. No output written to build/genmatch
collect2: error: ld returned 1 exit status
make[3]: *** [build/genmatch] Error 1

It seems the following patch fixes this, at least a i386-pc-solaris2.10
bootstrap is in stage2 now.

Ok for mainline?

	Rainer


2014-10-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* Makefile.in (build/genmatch(build_exeext)): Add $(LIBINTL) to
	BUILD_LIBS.
	Add $(LIBINTL_DEP) dependency.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gm.patch --]
[-- Type: text/x-patch, Size: 585 bytes --]

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2519,8 +2519,9 @@ genprog = $(genprogerr) check checksum c
 
 # These programs need libs over and above what they get from the above list.
 build/genautomata$(build_exeext) : BUILD_LIBS += -lm
-
-build/genmatch$(build_exeext) : $(CPPLIB) $(LIBIBERTY) \
+build/genmatch(build_exeext) : BUILD_LIBS += $(LIBINTL)
+
+build/genmatch$(build_exeext) : $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) \
   $(BUILD_ERRORS) build/vec.o build/hash-table.o
 
 # These programs are not linked with the MD reader.

[-- Attachment #3: Type: text/plain, Size: 143 bytes --]


-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University

Re: [build] Link genmatch with $(LIBINTL)

[Jakub Jelinek]

On Wed, Oct 22, 2014 at 05:53:22PM +0200, Rainer Orth wrote:
> 2014-10-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
> 
> 	* Makefile.in (build/genmatch(build_exeext)): Add $(LIBINTL) to

Shouldn't that be build/genmatch$(build_exeext) , both in the ChangeLog and
more importantly, in the patch?

> 	BUILD_LIBS.
> 	Add $(LIBINTL_DEP) dependency.
> 

> diff --git a/gcc/Makefile.in b/gcc/Makefile.in
> --- a/gcc/Makefile.in
> +++ b/gcc/Makefile.in
> @@ -2519,8 +2519,9 @@ genprog = $(genprogerr) check checksum c
>  
>  # These programs need libs over and above what they get from the above list.
>  build/genautomata$(build_exeext) : BUILD_LIBS += -lm
> -
> -build/genmatch$(build_exeext) : $(CPPLIB) $(LIBIBERTY) \
> +build/genmatch(build_exeext) : BUILD_LIBS += $(LIBINTL)
> +
> +build/genmatch$(build_exeext) : $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) \
>    $(BUILD_ERRORS) build/vec.o build/hash-table.o
>  
>  # These programs are not linked with the MD reader.

> 
> -- 
> -----------------------------------------------------------------------------
> Rainer Orth, Center for Biotechnology, Bielefeld University


	Jakub

Re: [build] Link genmatch with $(LIBINTL)

[Joseph S. Myers]

On Wed, 22 Oct 2014, Rainer Orth wrote:

> 2014-10-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
> 
> 	* Makefile.in (build/genmatch(build_exeext)): Add $(LIBINTL) to
> 	BUILD_LIBS.
> 	Add $(LIBINTL_DEP) dependency.

No, this doesn't look right.  A program built for the build system needs 
to use build versions of all relevant libraries, not host versions.  That 
means $(BUILD_LIBIBERTY) not host libiberty, and build versions of libcpp 
and libintl if those are now needed for something built for the build 
system.  That in turn needs toplevel changes to add libcpp and intl to 
build_modules.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [build] Link genmatch with $(LIBINTL)

[Richard Biener]

On October 22, 2014 7:19:33 PM CEST, "Joseph S. Myers" <joseph@codesourcery.com> wrote:
>On Wed, 22 Oct 2014, Rainer Orth wrote:
>
>> 2014-10-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
>> 
>> 	* Makefile.in (build/genmatch(build_exeext)): Add $(LIBINTL) to
>> 	BUILD_LIBS.
>> 	Add $(LIBINTL_DEP) dependency.
>
>No, this doesn't look right.  A program built for the build system
>needs 
>to use build versions of all relevant libraries, not host versions. 
>That 
>means $(BUILD_LIBIBERTY) not host libiberty, and build versions of
>libcpp 
>and libintl if those are now needed for something built for the build 
>system.  That in turn needs toplevel changes to add libcpp and intl to 
>build_modules.

I suppose we should build the build variant of libcpp without NLS support instead.

Richard.

Re: [build] Link genmatch with $(LIBINTL)

[Joseph S. Myers]

On Wed, 22 Oct 2014, Richard Biener wrote:

> On October 22, 2014 7:19:33 PM CEST, "Joseph S. Myers" <joseph@codesourcery.com> wrote:
> >On Wed, 22 Oct 2014, Rainer Orth wrote:
> >
> >> 2014-10-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
> >> 
> >> 	* Makefile.in (build/genmatch(build_exeext)): Add $(LIBINTL) to
> >> 	BUILD_LIBS.
> >> 	Add $(LIBINTL_DEP) dependency.
> >
> >No, this doesn't look right.  A program built for the build system
> >needs 
> >to use build versions of all relevant libraries, not host versions. 
> >That 
> >means $(BUILD_LIBIBERTY) not host libiberty, and build versions of
> >libcpp 
> >and libintl if those are now needed for something built for the build 
> >system.  That in turn needs toplevel changes to add libcpp and intl to 
> >build_modules.
> 
> I suppose we should build the build variant of libcpp without NLS support instead.

Indeed, that would avoid various complications such as configure options 
for where to find libiconv only being correct for the host and not the 
build system.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [build] Link genmatch with $(LIBINTL)

[David Edelsohn]

On Wed, Oct 22, 2014 at 1:31 PM, Richard Biener <rguenther@suse.de> wrote:
> On October 22, 2014 7:13:41 PM CEST, David Edelsohn <dje.gcc@gmail.com> wrote:
>>I reported the same problem in a separate thread.
>>
>>On AIX it needs LIBINTL and LIBICONV.
>
> I wonder what ends up linking those with Linux? Or is all the features available from glibc?

The dependency comes from libcpp.

Thanks, David

Re: [build] Link genmatch with $(LIBINTL)

[Richard Biener]

On October 22, 2014 7:13:41 PM CEST, David Edelsohn <dje.gcc@gmail.com> wrote:
>I reported the same problem in a separate thread.
>
>On AIX it needs LIBINTL and LIBICONV.

I wonder what ends up linking those with Linux? Or is all the features available from glibc?

Fixed patch is OK.

Thanks,
Richard.

>Index: Makefile.in
>===================================================================
>--- Makefile.in (revision 216542)
>+++ Makefile.in (working copy)
>@@ -2520,7 +2520,7 @@
># These programs need libs over and above what they get from the above
>list.
> build/genautomata$(build_exeext) : BUILD_LIBS += -lm
>
>-build/genmatch$(build_exeext) : $(CPPLIB) $(LIBIBERTY) \
>+build/genmatch$(build_exeext) : $(CPPLIB) $(LIBIBERTY) $(LIBINTL)
>$(LIBICONV) \
>   $(BUILD_ERRORS) build/vec.o build/hash-table.o
>
> # These programs are not linked with the MD reader.
>
>
>Thanks, David

Re: [build] Link genmatch with $(LIBINTL)

[David Edelsohn]

I reported the same problem in a separate thread.

On AIX it needs LIBINTL and LIBICONV.

Index: Makefile.in
===================================================================
--- Makefile.in (revision 216542)
+++ Makefile.in (working copy)
@@ -2520,7 +2520,7 @@
 # These programs need libs over and above what they get from the above list.
 build/genautomata$(build_exeext) : BUILD_LIBS += -lm

-build/genmatch$(build_exeext) : $(CPPLIB) $(LIBIBERTY) \
+build/genmatch$(build_exeext) : $(CPPLIB) $(LIBIBERTY) $(LIBINTL) $(LIBICONV) \
   $(BUILD_ERRORS) build/vec.o build/hash-table.o

 # These programs are not linked with the MD reader.


Thanks, David