fix patch so it actually compiles #112930 by Juergen Rose

Package-Manager: portage-2.0.53_rc7

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 487c7c034a0edda1c51eae692eddf6905119c300..93a2cf48a76cc5a2e02f0b453cf78a60619edd1a 100644 (file)
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 4013a2f14b0bf28966e7942b57cd7a13 ChangeLog 3603
 MD5 555b9015ffbcc8fd484c63ab096069d7 files/02.00b-cpuid-PIC.patch 1098
 MD5 29a53d370bf1395481ea9d8528f410d1 files/digest-lshw-02.04b 64
 MD5 aa4eb15e3a195e90ce0bf111bcd37e2f files/digest-lshw-02.05.01b 67
 MD5 83309023b708d6b03a2cc931a71e2352 files/digest-lshw-02.06b 64
 MD5 7fbeefb274e662632462f5a5465f24d9 files/lshw-02.06b-build.patch 1652
-MD5 fab2fbfdcae14bdfd177df3194e261ac files/lshw-02.06b-cpuid-PIC.patch 1023
+MD5 5ba7b6610d3d3fa5450d59a99e96694c files/lshw-02.06b-cpuid-PIC.patch 1060
 MD5 8acb70976be17c39d5349c85e31a76f8 lshw-02.04b.ebuild 1384
 MD5 8493c243aa959741074b74c904978b72 lshw-02.05.01b.ebuild 1358
 MD5 f39283f94db7bdb2c0701974246853a1 lshw-02.06b.ebuild 1155
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfsyGgIKl8Uu19MoRApSZAJ4mLny76+vKgoLLccQuu1vC9JCsgACdEHR6
+0EnlMxBCfJwl77H4Z7/L4uk=
+=Yc18
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch b/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch
index 524b2095780fc3fac8c2813fc001f1feb7bd9341..b27b3a808d13db3222a49f58b6fc2741ee58ad61 100644 (file)
--- a/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch
+++ b/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch
@@ -18,7 +18,7 @@ http://bugs.gentoo.org/61947
  static void cpuid(int cpunumber,
                  unsigned long idx,
                  unsigned long &eax,
-@@ -96,7 +93,18 @@
+@@ -96,7 +93,21 @@
      edx = (*(unsigned long *) (buffer + 12));
    }
    else
@@ -29,12 +29,15 @@ http://bugs.gentoo.org/61947
 +        "cpuid\n"
 +        "movl %%ebx,%3\n"
 +        "movl %%edi,%%ebx\n"
-+        : "=a" (eax), "=c" (ecx), "=d" (edx), "=m" (ebx), "edi"
++        : "=a" (eax), "=c" (ecx), "=d" (edx), "=m" (ebx)
++        : "a" (idx)
++        : "edi"
 +#else
 +        "cpuid\n"
 +        : "=a" (eax), "=c" (ecx), "=d" (edx), "=b" (ebx)
++        : "a" (idx)
 +#endif
-+        : "a" (idx));
++    );
  }
  
  /* Decode Intel TLB and cache info descriptors */