From: jbj <devnull@localhost>
Date: Sun, 9 Dec 2001 20:17:38 +0000 (+0000)
Subject: - solaris: translate i86pc to i386 (#57182).
X-Git-Tag: rpm-4.4-release~1311
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53ce5564b5301c79af54c933d092524e946102fa;p=platform%2Fupstream%2Frpm.git

- solaris: translate i86pc to i386 (#57182).

CVS patchset: 5218
CVS date: 2001/12/09 20:17:38
---

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 605f485..8081990 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -964,6 +964,12 @@ static void defaultMachine(/*@out@*/ const char ** arch,
 	    else /* Solaris 2.x: n.x.x becomes n-3.x.x */
 		sprintf(un.sysname, "solaris%1d%s", atoi(un.release)-3,
 			un.release+1+(atoi(un.release)/10));
+
+	    /* Solaris on Intel hardware reports i86pc instead of i386
+	     * (at least on 2.6 and 2.8)
+	     */
+	    if (!strcmp(un.machine, "i86pc"))
+		sprintf(un.machine, "i386");
 	}
 	else if (!strcmp(un.sysname, "HP-UX"))
 	    /*make un.sysname look like hpux9.05 for example*/