Mercurial > mxe-octave

comparison src/build-gcc-1-msgfmt.patch @ 6213:5f64fb928091 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build-gcc: Avoid library clash when calling msgfmt. * src/build-gcc-1-msgfmt.patch: Don't use libraries from the build tree when calling `msgfmt`. * dist-files.mk: Add patch to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 06 May 2022 19:36:10 +0200
parents
children
comparison
equal deleted inserted replaced
6212:fbb4c524bed1 6213:5f64fb928091
1 When `msgfmt` is called after libstdc++ was built, and that existing program
2 was linked against an incompatible version of libstdc++, it must not link to
3 that new version of libstdc++ but to the library installed on the system.
4 The path to the new library must not be set in LD_LIBRARY_PATH to avoid an
5 error. Set LD_LIBRARY_PATH to an empty string to load the libraroes installed
6 on the build system instead.
7
8 diff -urN gcc-11.3.0/libstdc++-v3/po/Makefile.am.orig gcc-11.3.0/libstdc++-v3/po/Makefile.am
9 --- gcc-11.3.0/libstdc++-v3/po/Makefile.am.orig 2022-04-21 09:58:57.000000000 +0200
10 +++ gcc-11.3.0/libstdc++-v3/po/Makefile.am 2022-05-04 08:47:07.588346500 +0200
11 @@ -38,7 +38,7 @@
12 EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
13
14 .po.mo:
15 - $(MSGFMT) -o $@ $<
16 + LD_LIBRARY_PATH="" $(MSGFMT) -o $@ $<
17
18 all-local: all-local-$(USE_NLS)
19 all-local-no:
20
21 diff -urN gcc-11.3.0/libstdc++-v3/po/Makefile.in.orig gcc-11.3.0/libstdc++-v3/po/Makefile.in
22 --- gcc-11.3.0/libstdc++-v3/po/Makefile.in.orig 2022-04-21 09:58:57.000000000 +0200
23 +++ gcc-11.3.0/libstdc++-v3/po/Makefile.in 2022-05-04 08:46:57.356251900 +0200
24 @@ -553,7 +553,7 @@
25
26
27 .po.mo:
28 - $(MSGFMT) -o $@ $<
29 + LD_LIBRARY_PATH="" $(MSGFMT) -o $@ $<
30
31 all-local: all-local-$(USE_NLS)
32 all-local-no: