[oe-commits] org.oe.dreambox liboil: fix powerpc build with kernel < 2.6.13

[tmbinc commit]

liboil: fix powerpc build with kernel < 2.6.13

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 2d0109498dc54616a4d03486cddda830e13c2119
ViewMTN: http://monotone.openembedded.org/revision/info/2d0109498dc54616a4d03486cddda830e13c2119
Files:
1
packages/liboil/files/fix_ppc_build_with_old_kernel.diff
packages/liboil/liboil_0.3.14.bb
Diffs:

#
# mt diff -r0682f3ebf52742ac0aeec4636ffea01a70e3b26b -r2d0109498dc54616a4d03486cddda830e13c2119
#
#
#
# add_file "packages/liboil/files/fix_ppc_build_with_old_kernel.diff"
#  content [bcb5add331b3da0eb6444b1e8aba2663127f15df]
# 
# patch "packages/liboil/liboil_0.3.14.bb"
#  from [68d65faaa47bae521859f007505413ae5dda8c17]
#    to [7f6b09f227cbf16ee30da77316d822e0ab9db912]
#
============================================================
--- packages/liboil/files/fix_ppc_build_with_old_kernel.diff	bcb5add331b3da0eb6444b1e8aba2663127f15df
+++ packages/liboil/files/fix_ppc_build_with_old_kernel.diff	bcb5add331b3da0eb6444b1e8aba2663127f15df
@@ -0,0 +1,32 @@
+diff -Naur liboil-0.3.14-org/liboil/liboilcpu-powerpc.c liboil-0.3.14/liboil/liboilcpu-powerpc.c
+--- liboil-0.3.14-org/liboil/liboilcpu-powerpc.c	2008-03-13 08:22:52.000000000 +0100
++++ liboil-0.3.14/liboil/liboilcpu-powerpc.c	2008-07-14 11:50:17.000000000 +0200
+@@ -35,7 +35,10 @@
+ #include <liboil/liboilutils.h>
+ 
+ #if defined(__linux__)
++#include <linux/version.h>
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+ #include <linux/auxvec.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+@@ -101,7 +104,7 @@
+ }
+ #endif
+ 
+-#if defined(__linux__)
++#if defined(__linux__) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+ static void
+ oil_check_altivec_proc_auxv (void)
+ {
+@@ -169,7 +172,7 @@
+   oil_check_altivec_sysctl_freebsd();
+ #elif defined(__APPLE__)
+   oil_check_altivec_sysctl_darwin();
+-#elif defined(__linux__)
++#elif defined(__linux__) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+   oil_check_altivec_proc_auxv();
+ #else
+   oil_check_altivec_fault();
============================================================
--- packages/liboil/liboil_0.3.14.bb	68d65faaa47bae521859f007505413ae5dda8c17
+++ packages/liboil/liboil_0.3.14.bb	7f6b09f227cbf16ee30da77316d822e0ab9db912
@@ -8,7 +8,8 @@ SRC_URI_append_opendreambox = " \
 
 SRC_URI_append_opendreambox = " \
 	file://no_ppc_altivec.diff;patch=1;pnum=1 \
-	file://no_ppc_fpu.diff;patch=1;pnum=1"
+	file://no_ppc_fpu.diff;patch=1;pnum=1 \
+	file://fix_ppc_build_with_old_kernel.diff;patch=1;pnum=1"
 
 inherit autotools pkgconfig