pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/xz Fix build on NetBSD-4.0/i386. Patches fro...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f67c41f4025a
branches: trunk
changeset: 564470:f67c41f4025a
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Sep 04 16:57:14 2009 +0000
description:
Fix build on NetBSD-4.0/i386. Patches from Robert Elz in PR 41963.
(Also sent upstream.)
diffstat:
archivers/xz/distinfo | 4 +++-
archivers/xz/patches/patch-aa | 13 +++++++++++++
archivers/xz/patches/patch-ab | 13 +++++++++++++
3 files changed, 29 insertions(+), 1 deletions(-)
diffs (46 lines):
diff -r c1cd6a49a0b9 -r f67c41f4025a archivers/xz/distinfo
--- a/archivers/xz/distinfo Fri Sep 04 15:36:16 2009 +0000
+++ b/archivers/xz/distinfo Fri Sep 04 16:57:14 2009 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/08/31 08:59:11 wiz Exp $
+$NetBSD: distinfo,v 1.3 2009/09/04 16:57:14 wiz Exp $
SHA1 (xz-4.999.9beta.tar.gz) = 9627de3997ddcdb02f8d327e84b2cf1941ecd230
RMD160 (xz-4.999.9beta.tar.gz) = 1253ce01746c748c8549effa5041224044919c4e
Size (xz-4.999.9beta.tar.gz) = 1037541 bytes
+SHA1 (patch-aa) = e12358a68476f8c59b0f2886efc185bf2c1d1641
+SHA1 (patch-ab) = 190f58a65ebec8e7a978eb193e0841ec835bf3f1
diff -r c1cd6a49a0b9 -r f67c41f4025a archivers/xz/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/xz/patches/patch-aa Fri Sep 04 16:57:14 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2009/09/04 16:57:14 wiz Exp $
+
+--- src/common/cpucores.h.orig 2009-08-27 15:37:12.000000000 +0000
++++ src/common/cpucores.h
+@@ -40,7 +40,7 @@ cpucores(void)
+ int name[2] = { CTL_HW, HW_NCPU };
+ int cpus;
+ size_t cpus_size = sizeof(cpus);
+- if (!sysctl(name, &cpus, &cpus_size, NULL, NULL)
++ if (sysctl(name, 2, &cpus, &cpus_size, NULL, 0) > 0
+ && cpus_size == sizeof(cpus) && cpus > 0)
+ ret = (uint32_t)(cpus);
+ #endif
diff -r c1cd6a49a0b9 -r f67c41f4025a archivers/xz/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/xz/patches/patch-ab Fri Sep 04 16:57:14 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2009/09/04 16:57:14 wiz Exp $
+
+--- src/common/physmem.h.orig 2009-08-27 15:37:12.000000000 +0000
++++ src/common/physmem.h
+@@ -104,7 +104,7 @@ physmem(void)
+ uint64_t u64;
+ } mem;
+ size_t mem_ptr_size = sizeof(mem.u64);
+- if (!sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, NULL)) {
++ if (sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, 0) > 0) {
+ // IIRC, 64-bit "return value" is possible on some 64-bit
+ // BSD systems even with HW_PHYSMEM (instead of HW_PHYSMEM64),
+ // so support both.
Home |
Main Index |
Thread Index |
Old Index