Merge remote-tracking branch 'upstream/master' into zope4py3

component/firewalld/buildout.cfg

@@ -4,13 +4,14 @@ parts =
 
 extends =
   ../defaults.cfg
-  ../libtool/buildout.cfg
-  ../intltool/buildout.cfg
-  ../glib/buildout.cfg
-  ../python-slip/buildout.cfg
   ../dbus/buildout.cfg
   ../flex/buildout.cfg
+  ../glib/buildout.cfg
+  ../gnu-config/buildout.cfg
+  ../intltool/buildout.cfg
+  ../libtool/buildout.cfg
   ../nftables/buildout.cfg
+  ../python-slip/buildout.cfg
 
 [firewalld]
 recipe = slapos.recipe.cmmi
@@ -67,6 +68,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gobject-introspection-1.50.0.tar.xz
 md5sum = 5af8d724f25d0c9cfbe6df41b77e5dc0
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build-aux/
 configure-options =
   --disable-static
 
@@ -88,6 +90,7 @@ url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/pygobject-3.22.0.t
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python${python:version}/site-packages
 md5sum = ed4117ed5d554d25fd7718807fbf819f
 pre-configure =
+  cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
   sed -i 's#/usr/local#${gobject-introspection:location}#g' ${gobject-introspection:location}/lib/pkgconfig/gobject-introspection-1.0.pc
 configure-options =
   --disable-static

component/flex/buildout.cfg

 [buildout]
 extends =
   ../bison/buildout.cfg
+  ../gnu-config/buildout.cfg
   ../m4/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
@@ -11,6 +12,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
 md5sum = 2882e3179748cc9f9c23ec593d6adc8d
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build-aux/
 environment =
   M4=${m4:location}/bin/m4
   PATH=${bison:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/libffi/buildout.cfg

@@ -16,6 +16,7 @@ patch-options = -p1
 patches =
   ${:_profile_base_location_}/libdir.patch#f7274250c8ca43b10e7fc968f730b833
 configure-options =
+  --disable-multi-os-directory
   --disable-static
   --enable-portable-binary
   --with-gcc-arch=generic

component/nftables/buildout.cfg

@@ -5,12 +5,13 @@ parts =
 extends =
   ../defaults.cfg
   ../gmp/buildout.cfg
-
+  ../gnu-config/buildout.cfg
 
 [libnml]
 recipe = slapos.recipe.cmmi
 url = http://www.netfilter.org/projects/libmnl/files/libmnl-1.0.4.tar.bz2
 md5sum = be9b4b5328c6da1bda565ac5dffadb2d
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build-aux/
 
 [libnftnl]
 recipe = slapos.recipe.cmmi

component/pkgconfig/buildout.cfg

@@ -2,6 +2,8 @@
 # http://pkgconfig.freedesktop.org/
 
 [buildout]
+extends =
+  ../gnu-config/buildout.cfg
 parts =
   pkgconfig
 
@@ -10,6 +12,9 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz
 md5sum = f6e931e319531b736fadc017f470e68a
+pre-configure =
+  cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
+  cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess glib/
 configure-options =
   --with-internal-glib
   --disable-host-tool

component/swig/buildout.cfg

@@ -4,6 +4,7 @@
 [buildout]
 extends =
   ../bison/buildout.cfg
+  ../gnu-config/buildout.cfg
 parts =
   swig
 
@@ -12,6 +13,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://sourceforge.net/projects/swig/files/swig/swig-3.0.12/swig-3.0.12.tar.gz/download
 md5sum = 82133dfa7bba75ff9ad98a7046be687c
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess Tools/config/
 configure-options =
   --disable-ccache
   --with-python=${buildout:executable}

software/neoppod/software-common.cfg

@@ -34,7 +34,6 @@ part = python2.7
 
 [gcc:python2]
 # use old gcc version for old scipy version used in python2
-max_version = 8
 part = gcc-8.5
 
 [neoppod-repository]