changeset 3973:4f586cfb8438

osmesa: update for msys2 build * src/mingw-osmesa-1-fixes.patch: add extra check for tools name if cant find it
author John Donoghue
date Tue, 16 Jun 2015 12:12:49 -0400
parents 40b0b14d7eef
children a6b0b01511ba
files src/mingw-osmesa-1-fixes.patch
diffstat 1 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/mingw-osmesa-1-fixes.patch	Tue Jun 16 12:05:52 2015 -0400
+++ b/src/mingw-osmesa-1-fixes.patch	Tue Jun 16 12:12:49 2015 -0400
@@ -12,3 +12,18 @@
              # 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']        = ''