component/xorg: [all recipes] update bundled GNU Config

component/xorg/buildout.cfg

@@ -17,6 +17,7 @@ extends =
   ../perl-XML-Parser/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
+  ../gnu-config/buildout.cfg
   ./buildout.hash.cfg
 
 parts =
@@ -35,12 +36,14 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/util/util-macros-1.19.2.tar.gz
 md5sum = 5059b328fac086b733ffac6607164c41
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 
 [xproto]
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/xproto-7.0.31.tar.gz
 md5sum = 04b925bf9e472c80f9212615cd684f1e
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-specs
   --without-xmlto
@@ -54,6 +57,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/xextproto-7.3.0.tar.gz
 md5sum = 37b700baa8c8ea7964702d948dd13821
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-specs
   --without-xmlto
@@ -67,6 +71,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/xtrans-1.3.5.tar.gz
 md5sum = 6e4eac1b7c6591da0753052e1eccfb58
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 patches =
   ${:_profile_base_location_}/xtrans_tmp_env.patch#${xtrans_tmp_env.patch:md5sum}
 patch-options = -p1
@@ -83,6 +88,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXau-1.0.8.tar.gz
 md5sum = a85cd601d82bc79c0daa280917572e20
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -94,6 +100,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
 md5sum = abe9aa4886138150bbc04ae4f29b90e3
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PATH=${libxml2:location}/bin:%(PATH)s
   PYTHON=${buildout:executable}
@@ -103,12 +110,14 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/xcb/libpthread-stubs-0.4.tar.gz
 md5sum = 7d2734e604a3e2f6f665c420b835ab62
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 
 [libxcb]
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://xorg.freedesktop.org/archive/individual/xcb/libxcb-1.13.tar.bz2
 md5sum = c2b6cf928afa16b0047c974e7aaa783f
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 
 patches =
   ${:_profile_base_location_}/libxcb_tmp_env.patch#${libxcb_tmp_env.patch:md5sum}
@@ -131,6 +140,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://ftp.x.org/pub/individual/lib/libXext-1.3.3.tar.bz2
 md5sum = 52df7c4c1f0badd9f82ab124fb32eb97
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 pkg_config_depends = ${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}
 environment =
   PKG_CONFIG_PATH=${:pkg_config_depends}
@@ -150,6 +160,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/inputproto-2.3.2.tar.gz
 md5sum = 6450bad6f8d5ebe354b01b734d1fd7ca
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -159,6 +170,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/kbproto-1.0.7.tar.gz
 md5sum = 19acc5f02ae80381e216f443134e0bbb
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -168,6 +180,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libX11-1.6.6.tar.gz
 md5sum = 3fd4c6b9f2333dbc5d16824baa1cfb67
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 pkg_config_depends = ${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
 configure-options =
   --disable-static
@@ -190,6 +203,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXdmcp-1.1.2.tar.gz
 md5sum = ab0d6a38f0344a05d698ec7d48cfa5a8
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -203,6 +217,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
 md5sum = e7431ab84d37b2678af71e29355e101d
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -212,6 +227,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
 md5sum = 1a05fb01fa1d5198894c931cf925c025
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -221,6 +237,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
 md5sum = 5f4847c78e41b801982c8a5e06365b24
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -230,6 +247,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
 md5sum = 998e5904764b82642cc63d97b4ba9e95
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -239,6 +257,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/presentproto-1.1.tar.gz
 md5sum = dc689e8569eda66b8c404e355f575119
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -248,6 +267,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/xorgproto-2018.4.tar.gz
 md5sum = 2763268f5bc742e337415bfedf06b845
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 pkg_config_depends = ${xorg-util-macros:location}/share/pkgconfig
 environment =
   PKG_CONFIG_PATH=${:pkg_config_depends}
@@ -258,6 +278,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
 md5sum = a914ccc1de66ddeb4b611c6b0686e274
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -267,6 +288,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/videoproto-2.3.3.tar.gz
 md5sum = d984100603ee2420072f27bb491f4b7d
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -276,6 +298,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/fontsproto-2.1.3.tar.gz
 md5sum = 0415f0360e33f3202af67c6c46782251
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-specs
   --without-xmlto
@@ -289,6 +312,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
 md5sum = 1b4e5dede5ea51906f1530ca1e21d216
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -298,6 +322,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
 md5sum = cfdb57dae221b71b2703f8e2980eaaf4
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -307,6 +332,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
 md5sum = 9959fe0bfb22a0e7260433b8d199590a
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -316,6 +342,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://cairographics.org/releases/pixman-0.34.0.tar.gz
 md5sum = e80ebae4da01e77f68744319f01d52a3
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 
@@ -324,6 +351,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libfontenc-1.1.3.tar.gz
 md5sum = 0ffa28542aa7d246299b1f7211cdb768
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -335,6 +363,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXfont-1.5.4.tar.gz
 md5sum = 562cc729034de3442d860f1c50508c8b
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -346,6 +375,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXfont2-2.0.3.tar.gz
 md5sum = ba7277762e3737cd8dcb6c7fe5113a34
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -356,6 +386,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = https://www.x.org/releases/individual/lib/libxkbfile-1.0.9.tar.gz
 md5sum = 5aab87eba67f37dd910a19be5c1129ee
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -366,6 +397,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = https://www.x.org/releases/individual/data/xkeyboard-config-2.5.1.tar.gz
 md5sum = 62c6583b4ec5775717e7c8b05732763c
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
   --enable-shared
@@ -379,6 +411,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = https://www.x.org/releases/individual/app/xkbcomp-1.4.2.tar.gz
 md5sum = 84b6bafb660181a8c2572981a7fff54d
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 # Hardcoded location for xkeyboard-config, needed during compile time
 xkeyboard-config-location = ${libxkbfile:location}/../xkeyboard-config/share/X11/xkb
 configure-options =
@@ -393,12 +426,14 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2
 md5sum = d43c2afc69937655d13c02588c9ff974
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 
 [libXrender]
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXrender-0.9.10.tar.gz
 md5sum = 98a14fc11aee08b4a1769426ab4b23a3
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -410,6 +445,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXinerama-1.1.4.tar.gz
 md5sum = 416f5afc64b8d064187b3508081dd194
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -421,6 +457,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libICE-1.0.9.tar.gz
 md5sum = 95812d61df8139c7cacc1325a26d5e37
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
   --without-xmlto
@@ -434,6 +471,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libSM-1.2.2.tar.gz
 md5sum = 18e5084ed9500b1b47719fd1758f0ec8
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
   --without-xmlto
@@ -448,6 +486,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXt-1.1.5.tar.gz
 md5sum = 77d317fbc508dd6adefb59d57a663032
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -459,6 +498,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/dri2proto-2.8.tar.gz
 md5sum = 19ea18f63d8ae8053c9fa84b60365b77
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -471,6 +511,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libpciaccess-0.14.tar.gz
 md5sum = 344872335233111f44504d3f7cb71bb3
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -481,6 +522,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/util/makedepend-1.0.5.tar.gz
 md5sum = efb2d7c7e22840947863efaedc175747
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -492,6 +534,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/glproto-1.4.17.tar.gz
 md5sum = d69554c1b51a83f2c6976a640819911b
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -503,6 +546,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXfixes-5.0.3.tar.gz
 md5sum = fd07d0d77e92b0a72ca1740a72322837
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -514,6 +558,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXdamage-1.1.4.tar.gz
 md5sum = 95867778da012623815214769007c0d7
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -525,6 +570,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXmu-1.1.2.tar.gz
 md5sum = d5be323b02e6851607205c8e941b4e61
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${libSM:location}/lib/pkgconfig
@@ -534,12 +580,14 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.x.org/releases/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
 md5sum = 98482f65ba1e74a08bf5b056a4031ef0
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 
 [libXcomposite]
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXcomposite-0.4.4.tar.gz
 md5sum = af860b1554a423735d831e6f29ac1ef5
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -551,6 +599,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXcursor-1.1.15.tar.gz
 md5sum = 837cd0d40afa6ecdafaf6f7b574a0899
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-static
 environment =
@@ -561,6 +610,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = https://www.x.org/releases/individual/app/xwd-1.0.7.tar.gz
 md5sum = 3ebd74f7a1980305e5e19ec8ff7aa794
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig
@@ -572,6 +622,7 @@ environment =
 recipe = slapos.recipe.cmmi
 url = https://www.x.org/releases/individual/xserver/xorg-server-1.20.1.tar.gz
 md5sum = f5ba68452b1710306aabc32308c6ac59
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 patches =
   ${:_profile_base_location_}/xorg-server_tmp_env.patch#${xorg-server_tmp_env.patch:md5sum}
 patch-options = -p1
@@ -599,6 +650,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXi-1.7.9.tar.gz
 md5sum = 7f0483d3fa110092b75378b3c926566f
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 pkg_config_depends = ${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig
 environment =
   PKG_CONFIG_PATH=${:pkg_config_depends}
@@ -615,6 +667,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXtst-1.2.3.tar.gz
 md5sum = 2534e6015a52e0bb7b6f9148ca180028
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-specs
   --disable-static
@@ -630,6 +683,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2
 md5sum = edd8a73775e8ece1d69515dd17767bfb
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
@@ -639,6 +693,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXScrnSaver-1.2.3.tar.gz
 md5sum = 6ae51eb64351e11cea281f3a331ac461
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${scrnsaverproto:location}/lib/pkgconfig
@@ -648,6 +703,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/lib/libXrandr-1.5.1.tar.gz
 md5sum = 59e90a544ee8cf706cf11e3027339f60
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 pkg_config_depends = ${libX11:location}/lib/pkgconfig:${xorgproto:pkg_config_depends}:${xorgproto:location}/share/pkgconfig:${libXext:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
 environment =
   PKG_CONFIG_PATH=${:pkg_config_depends}