Bug 857697 - Add even more i686 packages to the x86-64 linux32 environment on the "date" branch. r=Callek
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 23 Apr 2013 23:15:10 +0200
changeset 8319 b343fcc209b8e8f9f36c81ce028db278391cf1f2
parent 8318 db69d0b47690ac7e7d0c9aebe2f06c226012e62c
child 8320 38fe130024198d0bbba9940e5cc5f68e20e1dbd5
child 8323 67160abd6aeab228470fa7cd14e72d7296f27c42
push id6336
push usermh@glandium.org
push dateTue, 23 Apr 2013 21:16:28 +0000
reviewersCallek
bugs857697
Bug 857697 - Add even more i686 packages to the x86-64 linux32 environment on the "date" branch. r=Callek
mozilla/config.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1749,16 +1749,34 @@ for platform in ['linux', 'linux-debug']
          'gnome-vfs2-devel.i686', 'GConf2-devel.i686', 'wget',
          'mpfr',  # required for system compiler
          'xorg-x11-font*',  # fonts required for PGO
          'imake',  # required for makedepend!?!
          'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'yasm', 'ccache',  # <-- from releng repo
          'valgrind',
          'pulseaudio-libs-devel.i686',
          'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
+         # Packages already installed in the mock environment, as x86_64
+         # packages.
+         'glibc-devel.i686', 'libgcc.i686', 'libstdc++-devel.i686',
+         # yum likes to install .x86_64 -devel packages that satisfy .i686
+         # -devel packages dependencies. So manually install the dependencies
+         # of the above packages.
+         'ORBit2-devel.i686', 'atk-devel.i686', 'cairo-devel.i686',
+         'check-devel.i686', 'dbus-devel.i686', 'dbus-glib-devel.i686',
+         'fontconfig-devel.i686', 'freetype-devel.i686', 'glib2-devel.i686',
+         'hal-devel.i686', 'libICE-devel.i686', 'libIDL-devel.i686',
+         'libSM-devel.i686', 'libXau-devel.i686', 'libXcomposite-devel.i686',
+         'libXcursor-devel.i686', 'libXdamage-devel.i686', 'libXdmcp-devel.i686',
+         'libXext-devel.i686', 'libXfixes-devel.i686', 'libXft-devel.i686',
+         'libXi-devel.i686', 'libXinerama-devel.i686', 'libXrandr-devel.i686',
+         'libXrender-devel.i686', 'libXxf86vm-devel.i686', 'libdrm-devel.i686',
+         'libidn-devel.i686', 'libpng-devel.i686', 'libxcb-devel.i686',
+         'libxml2-devel.i686', 'pango-devel.i686', 'perl-devel.i686',
+         'pixman-devel.i686', 'zlib-devel.i686',
          ]
 
 ######## generic branch configs
 for branch in ACTIVE_PROJECT_BRANCHES:
     branchConfig = PROJECT_BRANCHES[branch]
     BRANCHES[branch]['product_name'] = branchConfig.get('product_name', None)
     BRANCHES[branch]['app_name']     = branchConfig.get('app_name', None)
     BRANCHES[branch]['brand_name']   = branchConfig.get('brand_name', None)