Mercurial > mxe-octave

annotate src/mingw-osmesa-1-fixes.patch @ 3973:4f586cfb8438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a169ad26bac2
children 7d6f1fd0d672
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3790
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/scons/gallium.py b/scons/gallium.py
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/scons/gallium.py 2014-06-25 00:33:39.000000000 -0400
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/scons/gallium.py 2015-02-15 12:07:49.271713764 -0500
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -529,10 +529,6 @@
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 else:
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 if env['platform'] == 'windows':
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 - # Avoid depending on gcc runtime DLLs
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 - linkflags += ['-static-libgcc']
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 - if 'w64' in env['CC'].split('-'):
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 - linkflags += ['-static-libstdc++']
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 # Handle the @xx symbol munging of DLL exports
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 shlinkflags += ['-Wl,--enable-stdcall-fixup']
a169ad26bac2 use scons to build osmesa on windows systems
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 #shlinkflags += ['-Wl,--kill-at']
3973
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
15 diff -ur Mesa-10.2.2.orig/scons/crossmingw.py Mesa-10.2.2/scons/crossmingw.py
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
16 --- Mesa-10.2.2.orig/scons/crossmingw.py 2015-06-12 06:33:42.524589500 -0400
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
17 +++ Mesa-10.2.2/scons/crossmingw.py 2015-06-12 22:12:26.181163800 -0400
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
18 @@ -160,7 +160,11 @@
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
19 env.Append(SHLIBEMITTER = [shlib_emitter])
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
20 env['LINK'] = mingw_prefix + 'g++'
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
21 env['AR'] = mingw_prefix + 'ar'
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
22 + if not SCons.Util.WhereIs(env['AR']):
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
23 + env['AR'] = env['CC'] + '-ar'
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
24 env['RANLIB'] = mingw_prefix + 'ranlib'
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
25 + if not SCons.Util.WhereIs(env['RANLIB']):
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
26 + env['RANLIB'] = env['CC'] + '-ranlib'
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
27 env['LINK'] = mingw_prefix + 'g++'
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
28 env['AS'] = mingw_prefix + 'as'
4f586cfb8438 osmesa: update for msys2 build
John Donoghue
parents: 3790
diff changeset
29 env['WIN32DEFPREFIX'] = ''