Mercurial > mxe-octave
view src/mesa-1-fixes.patch @ 4803:e2349691d6ae
fix fontconfig dependencies
Only include fontconfig as a dependency if USE_SYSTEM_FONTCONFIG is no.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 17 Aug 2018 14:09:31 -0400 |
parents | a50783d698b2 |
children | a99cf8dbe52d |
line wrap: on
line source
diff -uNr a/scons/gallium.py b/scons/gallium.py --- a/scons/gallium.py 2017-09-17 19:03:22.000000000 -0400 +++ b/scons/gallium.py 2017-10-04 19:24:29.499373623 -0400 @@ -580,9 +580,6 @@ '-Wl,--dynamicbase', # ASLR ] # Avoid depending on gcc runtime DLLs - linkflags += ['-static-libgcc'] - if 'w64' in env['CC'].split('-'): - linkflags += ['-static-libstdc++'] # Handle the @xx symbol munging of DLL exports shlinkflags += ['-Wl,--enable-stdcall-fixup'] #shlinkflags += ['-Wl,--kill-at'] diff -uNr a/scons/llvm.py b/scons/llvm.py --- a/scons/llvm.py 2018-07-27 09:52:17.000000000 -0400 +++ b/scons/llvm.py 2018-07-30 10:16:26.424580230 -0400 @@ -122,6 +122,7 @@ 'LLVMIRReader', 'LLVMAsmParser', 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF', 'LLVMBinaryFormat', + 'version', 'uuid', 'ole32', 'oleaut32', 'z', ]) elif llvm_version >= distutils.version.LooseVersion('4.0'): env.Prepend(LIBS = [