All pastes #437259 Raw Edit

Someone

public text v1 · immutable
·published 2007-04-12 23:08 UTC
rendered paste body
--- group-paultest.recipe.orig  2007-04-12 19:07:33.000000000 -0400
+++ group-paultest.recipe       2007-04-12 19:08:19.000000000 -0400
@@ -47,7 +47,6 @@
         r.add('glibc:runtime', '2.3.6')
         r.add('gpm:runtime', '1.20.1')
         r.add('grep:runtime', '2.5.1')
-        r.add('grub:runtime', '0.95', flavor='is: x86')
         r.add('gzip:runtime', '1.3.3')
         r.add('hdparm:runtime', '6.1')
         r.add('hotplug', '2004_03_29')
@@ -138,6 +137,19 @@
         r.add('which:runtime', '2.16')
         r.add('xfsprogs:runtime', byDefault=False)
 
+        # a few things we have to special-case for x86_64
+        r.add('glibc:lib', flavor='is: x86(i486,i586,i686)', use=Arch.x86_64)
+
+        if Arch.x86_64:
+            r.add('grub:runtime', '0.95', flavor='grub.static is: x86')
+            r.add('grub:data', '0.95', flavor='grub.static is: x86')
+        else:
+            r.add('grub:runtime', '0.95')
+        if Arch.x86_64:
+            gccFlavor = 'is: x86 x86_64'
+            r.add('libgcc:lib', flavor=gccFlavor, source='gcc')
+            r.add('libstdc++:lib', flavor=gccFlavor, source='gcc')
+
         perl = 'group-paultest-perl'
         r.createGroup(perl, autoResolve=True)
         r.addNewGroup(perl, groupName='group-paultest', byDefault=False)