component/cups: Install in lib folder (no lib64).

Always install cups in lib folder, even when lib64 would be used by
default.

See merge request nexedi/slapos!1649

component/chromium/buildout.cfg

@@ -104,7 +104,6 @@ library =
   ${alsa:location}/lib
   ${cairo:location}/lib
   ${cups:location}/lib
-  ${cups:location}/lib64
   ${dbus:location}/lib/
   ${dbus-glib:location}/lib/
   ${fontconfig:location}/lib/

component/cups/buildout.cfg

@@ -12,6 +12,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://github.com/apple/cups/releases/download/release-1.7.4/cups-1.7.4-source.tar.bz2
 md5sum = 1a2295c2b2d2f422db2e50f40ed2fb99
+location = @@LOCATION@@
 configure-options =
   --disable-static
   --disable-dbus
@@ -25,6 +26,7 @@ configure-options =
   --disable-default-shared
   --disable-raw-printing
   --disable-webif
+  --libdir=${:location}/lib
 make-options =
   libs
 make-targets =

software/cloudooo/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 6f18a040f44d800dc43a8955f1f4f5b4
 
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = 1bc5c724d29337e1f35cfa60270fb08c
+md5sum = 5c72cc2c3f8e5be4690ea4dd5d4accaa
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

software/cloudooo/instance-cloudooo.cfg.in

@@ -160,7 +160,7 @@ includes =
 recipe = slapos.cookbook:generic.cloudooo
 ip = {{ ipv4 }}
 environment =
-  LD_LIBRARY_PATH = {{ parameter_dict['avahi'] }}/lib:{{ parameter_dict['cairo'] }}/lib:{{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['gcc'] }}/lib:{{ parameter_dict['gcc'] }}/lib64:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['glu'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['libexpat'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['mesa'] }}/lib:{{ parameter_dict['nss'] }}/lib:{{ parameter_dict['nspr'] }}/lib:{{ parameter_dict['pixman'] }}/lib:{{ parameter_dict['xdamage'] }}/lib:{{ parameter_dict['xfixes'] }}/lib:{{ parameter_dict['zlib'] }}/lib
+  LD_LIBRARY_PATH = {{ parameter_dict['avahi'] }}/lib:{{ parameter_dict['cairo'] }}/lib:{{ parameter_dict['cups'] }}/lib:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['gcc'] }}/lib:{{ parameter_dict['gcc'] }}/lib64:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['glu'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['libexpat'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['mesa'] }}/lib:{{ parameter_dict['nss'] }}/lib:{{ parameter_dict['nspr'] }}/lib:{{ parameter_dict['pixman'] }}/lib:{{ parameter_dict['xdamage'] }}/lib:{{ parameter_dict['xfixes'] }}/lib:{{ parameter_dict['zlib'] }}/lib
   FONTCONFIG_FILE = ${fontconfig-conf:output}
   PATH = ${binary-link:target-directory}
   LANG = C.UTF-8