diff options
author | tron <tron> | 2009-02-21 17:03:41 +0000 |
---|---|---|
committer | tron <tron> | 2009-02-21 17:03:41 +0000 |
commit | 18dc8fa37cbfc64ad3139196d60f64687e07244b (patch) | |
tree | 55356be255fd48615751277b9b613285b001d03e | |
parent | 9a05a2e9d5476143953b759a5eb04ae9adf2c403 (diff) | |
download | pkgsrc-18dc8fa37cbfc64ad3139196d60f64687e07244b.tar.gz |
Pullup ticket #2704 - requested by he
liboil: build fix
Revisions pulled up:
- devel/liboil/Makefile 1.20
- devel/liboil/distinfo 1.16
- devel/liboil/patches/patch-ad 1.4
---
Module Name: pkgsrc
Committed By: he
Date: Sat Feb 21 14:39:03 UTC 2009
Modified Files:
pkgsrc/devel/liboil: Makefile distinfo
Added Files:
pkgsrc/devel/liboil/patches: patch-ad
Log Message:
Upgrade from version 0.3.15 to 0.3.15nb1.
Pkgsrc changes:
o Provide proper detection of altivec on NetBSD powerpc ports.
As an added bonus, this now builds on NetBSD/macppc 3.1 where
it didn't earlier.
-rw-r--r-- | devel/liboil/Makefile | 3 | ||||
-rw-r--r-- | devel/liboil/distinfo | 3 | ||||
-rw-r--r-- | devel/liboil/patches/patch-ad | 68 |
3 files changed, 72 insertions, 2 deletions
diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile index 73ec8384eea..bdf5d1fcc75 100644 --- a/devel/liboil/Makefile +++ b/devel/liboil/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2008/07/30 09:53:36 wiz Exp $ +# $NetBSD: Makefile,v 1.18.6.1 2009/02/21 17:03:41 tron Exp $ # DISTNAME= liboil-0.3.15 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://liboil.freedesktop.org/download/ diff --git a/devel/liboil/distinfo b/devel/liboil/distinfo index b0419873b94..bfe6543dc79 100644 --- a/devel/liboil/distinfo +++ b/devel/liboil/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.14 2008/07/30 09:53:36 wiz Exp $ +$NetBSD: distinfo,v 1.14.6.1 2009/02/21 17:03:41 tron Exp $ SHA1 (liboil-0.3.15.tar.gz) = 8791e3399aae619b89a1d00f40ffcafc7d7f5d9b RMD160 (liboil-0.3.15.tar.gz) = ba6a4889dd8c16f62dee5c238e019b42066e6a9b Size (liboil-0.3.15.tar.gz) = 822195 bytes SHA1 (patch-ab) = 13ff4bef610a28174a2a41b74029f24f04fd598f SHA1 (patch-ac) = 4559e8b635099d96df59bcc5525eb3c0322720ba +SHA1 (patch-ad) = 25fdf7e3b007325c33b6b4be4bd58f543d6be514 diff --git a/devel/liboil/patches/patch-ad b/devel/liboil/patches/patch-ad new file mode 100644 index 00000000000..a3246bd4a2b --- /dev/null +++ b/devel/liboil/patches/patch-ad @@ -0,0 +1,68 @@ +$NetBSD: patch-ad,v 1.3.6.1 2009/02/21 17:03:41 tron Exp $ + +Provide proper detection of altivec on NetBSD/powerpc ports. + +--- liboil/liboilcpu-powerpc.c.orig 2008-06-30 19:57:33.000000000 +0000 ++++ liboil/liboilcpu-powerpc.c +@@ -59,6 +59,12 @@ + #include <sys/sysctl.h> + #endif + ++#if defined(__NetBSD__) ++#include <sys/types.h> ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#endif ++ + + /***** powerpc *****/ + +@@ -70,7 +76,7 @@ oil_profile_stamp_tb(void) + return ts; + } + +-#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && !defined(__linux__) ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && !defined(__linux__) && !defined(__NetBSD__) + static void + test_altivec (void * ignored) + { +@@ -78,6 +84,21 @@ test_altivec (void * ignored) + } + #endif + ++#if defined(__NetBSD__) ++static void ++oil_check_altivec_sysctl_netbsd (void) ++{ ++ int ret, av; ++ size_t len; ++ ++ len = sizeof(av); ++ ret = sysctlbyname("machdep.altivec", &av, &len, NULL, 0); ++ if (!ret && av) { ++ oil_cpu_flags |= OIL_IMPL_FLAG_ALTIVEC; ++ } ++} ++#endif ++ + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + static void + oil_check_altivec_sysctl_freebsd (void) +@@ -158,7 +179,7 @@ out: + } + #endif + +-#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && !defined(__linux__) ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && !defined(__linux__) && !defined(__NetBSD__) + static void + oil_check_altivec_fault (void) + { +@@ -176,6 +197,8 @@ oil_cpu_detect_arch(void) + { + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + oil_check_altivec_sysctl_freebsd(); ++#elif defined(__NetBSD__) ++ oil_check_altivec_sysctl_netbsd(); + #elif defined(__APPLE__) + oil_check_altivec_sysctl_darwin(); + #elif defined(__linux__) |