Mercurial > mxe-octave

view src/mingw-osmesa-1-fixes.patch @ 4222:44b1a9b2193e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents 4f586cfb8438
children 7d6f1fd0d672
line wrap: on
line source

diff -uNr a/scons/gallium.py b/scons/gallium.py
--- a/scons/gallium.py	2014-06-25 00:33:39.000000000 -0400
+++ b/scons/gallium.py	2015-02-15 12:07:49.271713764 -0500
@@ -529,10 +529,6 @@
         else:
             env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
         if env['platform'] == 'windows':
-            # 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 -ur Mesa-10.2.2.orig/scons/crossmingw.py Mesa-10.2.2/scons/crossmingw.py
--- Mesa-10.2.2.orig/scons/crossmingw.py       2015-06-12 06:33:42.524589500 -0400
+++ Mesa-10.2.2/scons/crossmingw.py    2015-06-12 22:12:26.181163800 -0400
@@ -160,7 +160,11 @@
     env.Append(SHLIBEMITTER = [shlib_emitter])
     env['LINK'] = mingw_prefix + 'g++'
     env['AR'] = mingw_prefix + 'ar'
+    if not SCons.Util.WhereIs(env['AR']):
+        env['AR'] = env['CC'] + '-ar'
     env['RANLIB'] = mingw_prefix + 'ranlib'
+    if not SCons.Util.WhereIs(env['RANLIB']):
+        env['RANLIB'] = env['CC'] + '-ranlib'
     env['LINK'] = mingw_prefix + 'g++'
     env['AS'] = mingw_prefix + 'as'
     env['WIN32DEFPREFIX']        = ''