Mercurial > mxe-octave

annotate src/mesa-1-fixes.patch @ 4778:a50783d698b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems Disable osmesa for Linux builds. * mesa-1-fixes.patch: Update for mesa 18.1.5. * mesa-2-fixes.patch, mingw-mesa-1-fixes.patch: Delete. * dist-files.mk: Update.
author John W. Eaton <jwe@octave.org>
date Mon, 30 Jul 2018 11:27:32 -0400
parents d50a2adc8d75
children a99cf8dbe52d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4489
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/scons/gallium.py b/scons/gallium.py
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/scons/gallium.py 2017-09-17 19:03:22.000000000 -0400
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/scons/gallium.py 2017-10-04 19:24:29.499373623 -0400
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -580,9 +580,6 @@
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 '-Wl,--dynamicbase', # ASLR
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 ]
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 # Avoid depending on gcc runtime DLLs
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 - linkflags += ['-static-libgcc']
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 - if 'w64' in env['CC'].split('-'):
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 - linkflags += ['-static-libstdc++']
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 # Handle the @xx symbol munging of DLL exports
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 shlinkflags += ['-Wl,--enable-stdcall-fixup']
d50a2adc8d75 mesa: don't force static libstdc++ or libgcc.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 #shlinkflags += ['-Wl,--kill-at']
4778
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
14 diff -uNr a/scons/llvm.py b/scons/llvm.py
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
15 --- a/scons/llvm.py 2018-07-27 09:52:17.000000000 -0400
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
16 +++ b/scons/llvm.py 2018-07-30 10:16:26.424580230 -0400
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
17 @@ -122,6 +122,7 @@
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
18 'LLVMIRReader', 'LLVMAsmParser',
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
19 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
20 'LLVMBinaryFormat',
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
21 + 'version', 'uuid', 'ole32', 'oleaut32', 'z',
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
22 ])
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
23 elif llvm_version >= distutils.version.LooseVersion('4.0'):
a50783d698b2 mesa.mk: Update to mesa 18.1.5 and build with llvm on Windows systems
John W. Eaton <jwe@octave.org>
parents: 4489
diff changeset
24 env.Prepend(LIBS = [