Mercurial > mxe-octave

annotate src/build-gcc-1-msgfmt.patch @ 7197:e03680baccc7 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 15 May 2024 13:07:42 +0200
parents 5f64fb928091
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6213
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 When `msgfmt` is called after libstdc++ was built, and that existing program
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 was linked against an incompatible version of libstdc++, it must not link to
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 that new version of libstdc++ but to the library installed on the system.
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 The path to the new library must not be set in LD_LIBRARY_PATH to avoid an
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 error. Set LD_LIBRARY_PATH to an empty string to load the libraroes installed
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 on the build system instead.
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 diff -urN gcc-11.3.0/libstdc++-v3/po/Makefile.am.orig gcc-11.3.0/libstdc++-v3/po/Makefile.am
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 --- gcc-11.3.0/libstdc++-v3/po/Makefile.am.orig 2022-04-21 09:58:57.000000000 +0200
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 +++ gcc-11.3.0/libstdc++-v3/po/Makefile.am 2022-05-04 08:47:07.588346500 +0200
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 @@ -38,7 +38,7 @@
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 .po.mo:
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 - $(MSGFMT) -o $@ $<
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 + LD_LIBRARY_PATH="" $(MSGFMT) -o $@ $<
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 all-local: all-local-$(USE_NLS)
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 all-local-no:
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 diff -urN gcc-11.3.0/libstdc++-v3/po/Makefile.in.orig gcc-11.3.0/libstdc++-v3/po/Makefile.in
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 --- gcc-11.3.0/libstdc++-v3/po/Makefile.in.orig 2022-04-21 09:58:57.000000000 +0200
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 +++ gcc-11.3.0/libstdc++-v3/po/Makefile.in 2022-05-04 08:46:57.356251900 +0200
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 @@ -553,7 +553,7 @@
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 .po.mo:
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 - $(MSGFMT) -o $@ $<
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 + LD_LIBRARY_PATH="" $(MSGFMT) -o $@ $<
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 all-local: all-local-$(USE_NLS)
5f64fb928091 build-gcc: Avoid library clash when calling msgfmt.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 all-local-no: