Mon Apr 25 16:31:16 2011 UTC ()
Pullup ticket #3419 - requested by he
devel/orc: build fix for powerpc
Revisions pulled up:
- devel/orc/Makefile 1.3
- devel/orc/distinfo 1.6
- devel/orc/patches/patch-ab 1.4
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: he
Date: Mon Apr 18 20:07:32 UTC 2011
Modified Files:
pkgsrc/devel/orc: Makefile distinfo
Added Files:
pkgsrc/devel/orc/patches: patch-ab
Log Message:
Add a patch so that this builds properly for powerpc.
Also bump package revision.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/orc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/orc/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/devel/orc/patches/patch-ab
(spz)
diff -r1.2 -r1.2.4.1 pkgsrc/devel/orc/Makefile
diff -r1.5 -r1.5.4.1 pkgsrc/devel/orc/distinfo
diff -r0 -r1.4.2.2 pkgsrc/devel/orc/patches/patch-ab
--- pkgsrc/devel/orc/Makefile 2010/10/16 16:56:23 1.2
+++ pkgsrc/devel/orc/Makefile 2011/04/25 16:31:15 1.2.4.1
| @@ -1,17 +1,18 @@ | | | @@ -1,17 +1,18 @@ |
| 1 | # $NetBSD: Makefile,v 1.2 2010/10/16 16:56:23 wiz Exp $ | | 1 | # $NetBSD: Makefile,v 1.2.4.1 2011/04/25 16:31:15 spz Exp $ |
| 2 | # | | 2 | # |
| 3 | | | 3 | |
| 4 | DISTNAME= orc-0.4.11 | | 4 | DISTNAME= orc-0.4.11 |
| | | 5 | PKGREVISION= 1 |
| 5 | CATEGORIES= devel | | 6 | CATEGORIES= devel |
| 6 | MASTER_SITES= http://code.entropywave.com/download/orc/ | | 7 | MASTER_SITES= http://code.entropywave.com/download/orc/ |
| 7 | | | 8 | |
| 8 | MAINTAINER= pkgsrc-users@NetBSD.org | | 9 | MAINTAINER= pkgsrc-users@NetBSD.org |
| 9 | HOMEPAGE= http://code.entropywave.com/projects/orc/ | | 10 | HOMEPAGE= http://code.entropywave.com/projects/orc/ |
| 10 | COMMENT= Compiler for vector operations | | 11 | COMMENT= Compiler for vector operations |
| 11 | LICENSE= modified-bsd | | 12 | LICENSE= modified-bsd |
| 12 | | | 13 | |
| 13 | PKG_DESTDIR_SUPPORT= user-destdir | | 14 | PKG_DESTDIR_SUPPORT= user-destdir |
| 14 | | | 15 | |
| 15 | GNU_CONFIGURE= yes | | 16 | GNU_CONFIGURE= yes |
| 16 | USE_LIBTOOL= yes | | 17 | USE_LIBTOOL= yes |
| 17 | USE_TOOLS= gmake | | 18 | USE_TOOLS= gmake |
--- pkgsrc/devel/orc/distinfo 2010/10/25 10:33:53 1.5
+++ pkgsrc/devel/orc/distinfo 2011/04/25 16:31:16 1.5.4.1
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.5 2010/10/25 10:33:53 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.5.4.1 2011/04/25 16:31:16 spz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (orc-0.4.11.tar.gz) = e99f684fc551c2bb3a5cdefe6fa5165174508a5f | | 3 | SHA1 (orc-0.4.11.tar.gz) = e99f684fc551c2bb3a5cdefe6fa5165174508a5f |
| 4 | RMD160 (orc-0.4.11.tar.gz) = 03bca8a087064c95978629fa9943b5ff305e8a0d | | 4 | RMD160 (orc-0.4.11.tar.gz) = 03bca8a087064c95978629fa9943b5ff305e8a0d |
| 5 | Size (orc-0.4.11.tar.gz) = 676224 bytes | | 5 | Size (orc-0.4.11.tar.gz) = 676224 bytes |
| 6 | SHA1 (patch-aa) = 85c1b652a886e93e087e42f7f9cc1f6a7a6f5ad6 | | 6 | SHA1 (patch-aa) = 85c1b652a886e93e087e42f7f9cc1f6a7a6f5ad6 |
| | | 7 | SHA1 (patch-ab) = 589967ac10bbfcf1cf557918aed86a93f0d85a2b |
$NetBSD: patch-ab,v 1.4.2.2 2011/04/25 16:31:16 spz Exp $
Fix this so that NetBSD is also probed for altivec on powerpc
(and so that this builds).
--- orc/orccpu-powerpc.c.orig 2010-07-09 23:56:52.000000000 +0000
+++ orc/orccpu-powerpc.c
@@ -45,7 +45,7 @@
#endif
-#if defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
@@ -76,9 +76,11 @@ test_altivec (void * ignored)
}
#endif
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
#if defined(__APPLE__)
#define SYSCTL "hw.vectorunit"
+#elif defined(__NetBSD__)
+#define SYSCTL "machdep.altivec"
#else
#define SYSCTL "hw.altivec"
#endif
@@ -174,7 +176,7 @@ out:
}
#endif
-#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__linux__)
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__linux__) && !defined(__NetBSD__)
static void
orc_check_altivec_fault (void)
{
@@ -190,7 +192,7 @@ orc_check_altivec_fault (void)
void
orc_cpu_detect_arch(void)
{
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__)
orc_check_altivec_sysctl_bsd();
#elif defined(__OpenBSD__)
orc_check_altivec_sysctl_openbsd();