[PATCH] libstdc++: Fix error shown during Solaris build

[Jonathan Wakely]

On 16/11/20 10:32 +0000, Jonathan Wakely wrote:
>On 16/11/20 11:17 +0100, Rainer Orth wrote:
>>Hi Jonathan,
>>
>>>Currently this is shown when building libstdc++ on Solaris:
>>>
>>>-lrt: open: No such file or directory
>>>
>>>The error comes from the make_sunver.pl script which tries to open each
>>>of its arguments. The arguments are passed by this make rule:
>>>
>>>	perl ${glibcxx_srcdir}/scripts/make_exports.pl \
>>>	  libstdc++-symbols.ver \
>>>	  $(libstdc___la_OBJECTS:%.lo=.libs/%.o) \
>>>	 `echo $(libstdc___la_LIBADD) | \
>>>	    sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \
>>>	 > $@ || (rm -f $@ ; exit 1)
>>>
>>>The $(libstdc___la_LIBADD) variable includes $(GLIBCXX_LIBS) which
>>>contains -lrt on Solaris.
>>>
>>>This patch adds another sed script to filter -l arguments from the echo
>>>command. In order to reliably match ' -l[^ ]* ' the echo arguments are
>>>quoted and a space added before and after them. This might be overkill
>>>just to remove -lrt from the start of the string, but should be robust
>>>in case other -l arguments are added to $(GLIBCXX_LIBS), or in case the
>>>$(libstdc___la_LIBADD) libraries are reordered.
>>>
>>>libstdc++-v3/ChangeLog:
>>>
>>>	* src/Makefile.am (libstdc++-symbols.ver-sun): Remove -lrt from
>>>	arguments passed to make_sunver.pl script.
>>>	* src/Makefile.in: Regenerate.
>>>
>>>Tested sparc-solaris2.11. Rainer, does this look OK?
>>
>>it does, but let me give it a try with both GNU sed and Solaris sed: we
>>had too many weird issues with the latter ;-(
>
>I think the machine I tested on (gcc211 in the compile farm) only has
>Solaris sed in the PATH, and it works there.
>
>I did try to use "-l ?[[:alnum:]]+" but Solaris sed only supports BREs
>(as POSIX requires) and there doesn't seem to be an equivalent of the
>GNU sed -E option to use EREs.

POSIX agreed to add the -E option 8 years ago but that hasn't made it
into the standard yet (because we're still on POSIX 2011+TC1+TC2 and
presumably have to wait for the next revision).

https://www.austingroupbugs.net/view.php?id=528
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html