annotate src/mesa-1-meson.patch @ 5579:2734b3818171

Avoid double-free with librsb (bug #58957). * src/librsb.mk: Add work-around to avoid double-free (provided by Michele Martone). * src/mingw-of-sparsersb-1-no-render.patch: Remove patch. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 02 Nov 2020 08:55:18 +0100
parents be0a7ce498e6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5499
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 Don't link to Win32 library libstdc++
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 diff --git "a/meson.build" "b/meson.build"
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 index eaaca7f..9b9d2d3 100644
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 --- "a/meson.build"
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 +++ "b/meson.build"
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 @@ -1030,8 +1030,7 @@ if host_machine.system() == 'windows'
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 add_project_link_arguments(
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 '-Wl,--nxcompat',
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 '-Wl,--dynamicbase',
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 '-static-libgcc',
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 - '-static-libstdc++',
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 language : ['c', 'cpp'],
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 )
be0a7ce498e6 Update mesa to version 20.0.8 (bug #58689).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 endif