diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-07-15 15:10:32 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-07-15 15:10:32 -0400 |
| commit | 35995769b516d228793940c5333ad522de992a6c (patch) | |
| tree | 366b81995e9afbf8f94ecf7d4237b325ec07a0a1 /gnu/packages/patches | |
| parent | c6f909809aecb225b66dc27e4afd3ff46ec31a38 (diff) | |
| parent | e03f6d5e956b348c142d0ffd9f89af845f05eb86 (diff) | |
| download | guix-35995769b516d228793940c5333ad522de992a6c.tar guix-35995769b516d228793940c5333ad522de992a6c.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/boost-mips-avoid-m32.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/patches/boost-mips-avoid-m32.patch b/gnu/packages/patches/boost-mips-avoid-m32.patch new file mode 100644 index 0000000000..811c9fb3aa --- /dev/null +++ b/gnu/packages/patches/boost-mips-avoid-m32.patch @@ -0,0 +1,15 @@ +The following patch prevents the use of the -m32 flag on mips, where it +is not understood by gcc, as well as other non-x86 architectures. + +diff -u -r boost_1_58_0.orig/tools/build/src/tools/gcc.jam boost_1_58_0/tools/build/src/tools/gcc.jam +--- boost_1_58_0.orig/tools/build/src/tools/gcc.jam 2015-04-04 19:25:07.000000000 +0200 ++++ boost_1_58_0/tools/build/src/tools/gcc.jam 2015-07-10 01:08:19.822733823 +0200 +@@ -451,7 +451,7 @@ + else + { + local arch = [ feature.get-values architecture : $(properties) ] ; +- if $(arch) != arm ++ if $(arch) = x86 + { + if $(model) = 32 + { |