diff --git a/component/gtk-3/buildout.cfg b/component/gtk-3/buildout.cfg index 8c562b3233b90f985bee37692ee6533d41227e23..26f2b6c7568008e7565e4c4a94109371ffdec40b 100644 --- a/component/gtk-3/buildout.cfg +++ b/component/gtk-3/buildout.cfg @@ -15,12 +15,10 @@ extends = recipe = slapos.recipe.cmmi url =http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/at-spi2-core-2.22.0.tar.xz md5sum = 3da5fe62a653e49dad1c47f9a46fee56 -depends = - ${perl-XML-Parser:location} configure-options = --disable-gtk-doc-html environment = - PATH=${dbus:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s + PATH=${dbus:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig CPPFLAGS=-I${inputproto:location}/include -I${kbproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${libXtst:location}/include -I${xextproto:location}/include -I${xproto:location}/include LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXi:location}/lib -Wl,-rpath=${libXi:location}/lib -L${libXtst:location}/lib -Wl,-rpath=${libXtst:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib diff --git a/component/intltool/buildout.cfg b/component/intltool/buildout.cfg index 9f76912e6ab29f9c3da2c592aa36f53fd1e28bfe..d94f40d73bdfe39ffc689375c292ae860d612bbc 100644 --- a/component/intltool/buildout.cfg +++ b/component/intltool/buildout.cfg @@ -15,8 +15,6 @@ md5sum = 12e517cac2b57a0121cda351570f1e63 patch-options = -p1 patches = ${:_profile_base_location_}/intltool-0.51.0.regexp.patch#3e7736d5ce7876e9a8d078c35e7f327b -depends = - ${perl-XML-Parser:location} environment = - PATH=${patch:location}/bin:${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s + PATH=${patch:location}/bin:${perl-XML-Parser:perl-PATH}:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${perl:location}/lib/pkgconfig diff --git a/component/systemd/buildout.cfg b/component/systemd/buildout.cfg index aa5e4b55a128d3326149c13736cd7a8290997b7c..48c44abc27bec5ee2390d0e93c95d137cb76e2b2 100644 --- a/component/systemd/buildout.cfg +++ b/component/systemd/buildout.cfg @@ -5,7 +5,6 @@ extends = ../gperf/buildout.cfg ../intltool/buildout.cfg ../libcap/buildout.cfg - ../perl/buildout.cfg ../perl-XML-Parser/buildout.cfg ../pkgconfig/buildout.cfg ../util-linux/buildout.cfg @@ -16,12 +15,10 @@ recipe = slapos.recipe.cmmi # XXX This version requires Linux kernel >= 3.7. url = https://www.freedesktop.org/software/systemd/systemd-221.tar.xz md5sum = b4d5a253841cf28a98b7ec99c45e3716 -depends = - ${perl-XML-Parser:location} location = ${buildout:parts-directory}/${:_buildout_section_name_} make-options = rootprefix=${:location} SYSTEM_SYSVINIT_PATH=${:location}/etc/init.d environment = - PATH=${coreutils:location}/bin:${gettext:location}/bin:${gperf:location}/bin:${intltool:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s + PATH=${coreutils:location}/bin:${gettext:location}/bin:${gperf:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s CPPFLAGS=-I${libcap:location}/include -I${util-linux:location}/include LDFLAGS=-L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib -L${util-linux:location}/lib -Wl,-rpath=${util-linux:location}/lib PKG_CONFIG_PATH=${util-linux:location}/lib/pkgconfig diff --git a/component/xorg/buildout.cfg b/component/xorg/buildout.cfg index 9adb3a778f9239b481d11cf3eea019309c7841d0..3540232db5b341d1c2146202926be1777ad75f94 100644 --- a/component/xorg/buildout.cfg +++ b/component/xorg/buildout.cfg @@ -14,6 +14,7 @@ extends = ../openssl/buildout.cfg ../patch/buildout.cfg ../perl/buildout.cfg + ../perl-XML-Parser/buildout.cfg ../pkgconfig/buildout.cfg ../zlib/buildout.cfg @@ -314,15 +315,13 @@ environment = recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2 md5sum = e7e31da9adb56ba52b5c18226b8cbef3 -depends = - ${perl-XML-Parser:location} configure-options = --disable-static --enable-shared --enable-compat-rules --with-xkb-rules-symlink=xfree86 environment = - PATH=${gettext:location}/bin:${intltool:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xkbcomp:location}/bin:%(PATH)s + PATH=${gettext:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}:${pkgconfig:location}/bin:${xkbcomp: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 [xkbcomp]