diff --git a/component/xorg/buildout.cfg b/component/xorg/buildout.cfg index 22e47fcc1c1cf22c04fa731ee2d716edf33039bf..e1782d92c64825856171bf025d9115f169439ad7 100644 --- a/component/xorg/buildout.cfg +++ b/component/xorg/buildout.cfg @@ -135,11 +135,17 @@ configure-options = recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/inputproto-2.2.tar.bz2 md5sum = 13c8aedaf98a92e282b7e456c0a5bed9 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [kbproto] recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 md5sum = 677ea8523eec6caca86121ad2dca0b71 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [libX11] recipe = slapos.recipe.cmmi @@ -178,36 +184,57 @@ configure-options = recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 md5sum = e7431ab84d37b2678af71e29355e101d +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [bigreqsproto] recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 md5sum = 1a05fb01fa1d5198894c931cf925c025 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [xcmiscproto] recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 md5sum = 5f4847c78e41b801982c8a5e06365b24 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [damageproto] recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 md5sum = 998e5904764b82642cc63d97b4ba9e95 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [randrproto] recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/randrproto-1.3.2.tar.bz2 md5sum = 597491c0d8055e2a66f11350c4985775 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [renderproto] recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 md5sum = a914ccc1de66ddeb4b611c6b0686e274 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [videoproto] recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2 md5sum = c3b348c6e2031b72b11ae63fc7f805c2 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [fontsproto] recipe = slapos.recipe.cmmi @@ -225,16 +252,25 @@ environment = recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 md5sum = 1b4e5dede5ea51906f1530ca1e21d216 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [resourceproto] recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 md5sum = cfdb57dae221b71b2703f8e2980eaaf4 +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [xineramaproto] recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 md5sum = 9959fe0bfb22a0e7260433b8d199590a +environment = + PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig + PATH=${pkgconfig:location}/bin:%(PATH)s [pixman] recipe = slapos.recipe.cmmi @@ -268,7 +304,7 @@ recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2 md5sum = 19e6533ae64abba0773816a23f2b9507 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:${xproto:location}/lib/pkgconfig + 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 CPPFLAGS=-I${zlib:location}/include LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib @@ -298,7 +334,7 @@ xkeyboard-config-location = ${libxkbfile:location}/../xkeyboard-config/share/X11 configure-options = --with-xkb-config-root=${:xkeyboard-config-location} environment = - PKG_CONFIG_PATH=${libxkbfile:location}/lib/pkgconfig:${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 + PKG_CONFIG_PATH=${libxkbfile:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${libXau:location}/lib/pkgconfig PATH=${pkgconfig:location}/bin:%(PATH)s LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxkbfile:location}/lib -Wl,-rpath=${libxkbfile:location}/lib @@ -360,7 +396,7 @@ configure-options = --disable-static environment = PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s - PKG_CONFIG_PATH=${libSM:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig + PKG_CONFIG_PATH=${libSM:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig [dri2proto] recipe = slapos.recipe.cmmi @@ -473,7 +509,7 @@ configure-options = --with-xkb-path=${xkeyboard-config:location}/share/X11/xkb --with-sha1=libgcrypt environment = - PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig + PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig CPPFLAGS=-I${bzip2:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${zlib:location}/include PATH=${pkgconfig:location}/bin:%(PATH)s LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib