Merge branch 'master' into staging

That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
parent dc5bbc4700 0e54c74911
commit 0b192a0976
206 changed files with 25329 additions and 3237 deletions
@@ -37,6 +37,10 @@ let

    patches = [ ./apr-1.patch ];

+    # SVN build seems broken on gcc5:
+    # https://gcc.gnu.org/gcc-5/porting_to.html
+    CPPFLAGS = "-P";
+
    configureFlags = ''
      ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
      ${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"}