[packages/rpm] - fix "noarch packages from x32 unusable on ix86" issue

[baggins]

commit 085633db55f660befee6f562d1b89dd93fd82841
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Apr 2 20:20:28 2015 +0200

    - fix "noarch packages from x32 unusable on ix86" issue

 x32.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
---
diff --git a/x32.patch b/x32.patch
index 773e383..ff53476 100644
--- a/x32.patch
+++ b/x32.patch
@@ -214,3 +214,25 @@ diff -ur rpm-5.4.15/lib/rpmds.c rpm-5.4.15.x32/lib/rpmds.c
  	xx = add(context, ds);
  	(void)rpmdsFree(ds);
  	ds = NULL;
+--- rpm-5.4.15/build/parseSpec.c~	2015-04-02 19:31:50.000000000 +0200
++++ rpm-5.4.15/build/parseSpec.c	2015-04-02 20:19:46.549637451 +0200
+@@ -732,9 +732,19 @@
+ 	 * to use a separate platform tag for these (mdvbz#61746).
+ 	 */
+ 	if(pkg->noarch && !platformNoarch && strcmp(arch, "noarch")) {
++#ifdef RPM_VENDOR_PLD
++	/*
++	 * This is a hack for x32 compatibility, on x32 _target_platform
++	 * does not use _target_cpu, it must use hardcoded x86-64.
++	 * This results in noarch packages using platform x86_64-pld-linux-gnux32
++	 * and being unusable on ix86.
++	 */
++	    platformNoarch = xstrdup("noarch-pld-linux");
++#else
+ 	    addMacro(NULL, "_target_cpu", NULL, "noarch", RMIL_RPMRC);
+ 	    platformNoarch = rpmExpand("%{_target_platform}", NULL);
+ 	    addMacro(NULL, "_target_cpu", NULL, arch, RMIL_RPMRC);
++#endif
+ 	}
+ 	he->tag = RPMTAG_PLATFORM;
+ 	he->t = RPM_STRING_TYPE;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/085633db55f660befee6f562d1b89dd93fd82841