|
 |
58f7f15 |
diff -rNu rpm-4.6.0-orig/lib/rpmrc.c rpm-4.6.0/lib/rpmrc.c
|
|
|
58f7f15 |
--- rpm-4.6.0-orig/lib/rpmrc.c 2009-03-09 21:54:49.000000000 -0500
|
|
|
58f7f15 |
+++ rpm-4.6.0/lib/rpmrc.c 2009-03-11 12:00:44.000000000 -0500
|
|
|
58f7f15 |
@@ -763,6 +763,31 @@
|
|
|
58f7f15 |
return rc;
|
|
|
58f7f15 |
}
|
|
|
58f7f15 |
|
|
|
58f7f15 |
+#if defined(__linux__) && defined(__sparc__)
|
|
|
58f7f15 |
+static int is_sun4v()
|
|
|
58f7f15 |
+{
|
|
|
58f7f15 |
+ char buffer[4096], *p;
|
|
|
58f7f15 |
+ int fd = open("/proc/cpuinfo", O_RDONLY);
|
|
|
58f7f15 |
+ if (read(fd, &buffer, sizeof(buffer) - 1) == -1) {
|
|
|
58f7f15 |
+ rpmlog(RPMLOG_WARNING, _("read(/proc/cpuinfo) failed\n"));
|
|
|
58f7f15 |
+ close(fd);
|
|
|
58f7f15 |
+ return 0;
|
|
|
58f7f15 |
+ }
|
|
|
58f7f15 |
+ close(fd);
|
|
|
58f7f15 |
+
|
|
|
58f7f15 |
+ p = strstr(buffer, "type");
|
|
|
58f7f15 |
+ p = strtok(p, "\n");
|
|
|
58f7f15 |
+ p = strstr(p, "sun");
|
|
|
58f7f15 |
+ if (p == NULL) {
|
|
|
58f7f15 |
+ rpmlog(RPMLOG_WARNING, _("/proc/cpuinfo has no 'type' line\n"));
|
|
|
58f7f15 |
+ return 0;
|
|
|
58f7f15 |
+ } else if (strcmp(p, "sun4v") == 0) {
|
|
|
58f7f15 |
+ return 1;
|
|
|
58f7f15 |
+ }
|
|
|
58f7f15 |
+ return 0;
|
|
|
58f7f15 |
+}
|
|
|
58f7f15 |
+#endif
|
|
|
58f7f15 |
+
|
|
|
58f7f15 |
|
|
|
58f7f15 |
# if defined(__linux__) && defined(__i386__)
|
|
|
58f7f15 |
#include <setjmp.h>
|
|
|
58f7f15 |
@@ -1179,6 +1204,13 @@
|
|
|
58f7f15 |
personality(oldpers);
|
|
|
58f7f15 |
}
|
|
|
58f7f15 |
}
|
|
|
58f7f15 |
+ if (is_sun4v()){
|
|
|
58f7f15 |
+ if (strcmp(un.machine, "sparcv9") == 0 || strcmp(un.machine, "sparc") == 0 ) {
|
|
|
58f7f15 |
+ strcpy(un.machine, "sparcv9v");
|
|
|
58f7f15 |
+ } else if (strcmp(un.machine, "sparc64") == 0 ) {
|
|
|
58f7f15 |
+ strcpy(un.machine, "sparc64v");
|
|
|
58f7f15 |
+ }
|
|
|
58f7f15 |
+ }
|
|
|
58f7f15 |
# endif /* sparc*-linux */
|
|
|
58f7f15 |
|
|
|
58f7f15 |
# if defined(__GNUC__) && defined(__alpha__)
|
|
|
58f7f15 |
diff -rNu rpm-4.6.0-orig/rpmrc.in rpm-4.6.0/rpmrc.in
|
|
|
58f7f15 |
--- rpm-4.6.0-orig/rpmrc.in 2009-03-09 21:54:49.000000000 -0500
|
|
|
58f7f15 |
+++ rpm-4.6.0/rpmrc.in 2009-03-11 11:50:49.000000000 -0500
|
|
|
58f7f15 |
@@ -312,7 +312,7 @@
|
|
|
58f7f15 |
arch_compat: sun4d: sparc
|
|
|
58f7f15 |
arch_compat: sun4m: sparc
|
|
|
58f7f15 |
arch_compat: sun4u: sparc64
|
|
|
58f7f15 |
-arch_compat: sparc64v: sparc64
|
|
|
58f7f15 |
+arch_compat: sparc64v: sparc64 sparcv9v
|
|
|
58f7f15 |
arch_compat: sparc64: sparcv9
|
|
|
58f7f15 |
arch_compat: sparcv9v: sparcv9
|
|
|
58f7f15 |
arch_compat: sparcv9: sparcv8
|