Mercurial > mxe-octave

comparison src/mesa-1-fixes.patch @ 4946:a99cf8dbe52d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mesa: Update to v18.2.8 * src/mesa.mk: Update version and checksum. Also install headers in KHR. * src/mesa-1-fixes.patch: Remove logic because we build g++ with pthreads. * src/mesa-proto.mk: Also install headers in KHR.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 21 Jan 2019 19:35:27 +0100
parents a50783d698b2
children c0d7569adb6c
comparison
equal deleted inserted replaced
4945:76828d146a8d 4946:a99cf8dbe52d
10 - linkflags += ['-static-libstdc++'] 10 - linkflags += ['-static-libstdc++']
11 # Handle the @xx symbol munging of DLL exports 11 # Handle the @xx symbol munging of DLL exports
12 shlinkflags += ['-Wl,--enable-stdcall-fixup'] 12 shlinkflags += ['-Wl,--enable-stdcall-fixup']
13 #shlinkflags += ['-Wl,--kill-at'] 13 #shlinkflags += ['-Wl,--kill-at']
14 diff -uNr a/scons/llvm.py b/scons/llvm.py 14 diff -uNr a/scons/llvm.py b/scons/llvm.py
15 --- a/scons/llvm.py 2018-07-27 09:52:17.000000000 -0400 15 --- a/scons/llvm.py 2018-12-27 17:02:01.000000000 +0100
16 +++ b/scons/llvm.py 2018-07-30 10:16:26.424580230 -0400 16 +++ b/scons/llvm.py 2019-01-21 18:47:28.456846140 +0100
17 @@ -122,6 +122,7 @@ 17 @@ -122,10 +122,7 @@
18 'LLVMIRReader', 'LLVMAsmParser', 18 'LLVMIRReader', 'LLVMAsmParser',
19 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF', 19 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
20 'LLVMBinaryFormat', 20 'LLVMBinaryFormat',
21 + 'version', 'uuid', 'ole32', 'oleaut32', 'z', 21 + 'version', 'uuid', 'ole32', 'oleaut32', 'z',
22 ]) 22 ])
23 - if env['platform'] == 'windows' and env['crosscompile']:
24 - # LLVM 5.0 requires MinGW w/ pthreads due to use of std::thread and friends.
25 - assert env['gcc']
26 - env['CXX'] = env['CXX'] + '-posix'
23 elif llvm_version >= distutils.version.LooseVersion('4.0'): 27 elif llvm_version >= distutils.version.LooseVersion('4.0'):
24 env.Prepend(LIBS = [ 28 env.Prepend(LIBS = [