summaryrefslogtreecommitdiff
path: root/packages/xorg-lib/libpciaccess
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-09-25 12:38:05 +0000
committerKoen Kooi <koen@openembedded.org>2008-09-25 12:38:05 +0000
commit8e4e856e3ce058841adf6692c83efca0c2fc85c2 (patch)
treedaf5c742f60756a62196e48cf1474fe22400487a /packages/xorg-lib/libpciaccess
parentebefc8130b47867e376a6c6cf4291ffe52f35b7d (diff)
xorg-lib: attempt to merge with poky
* fixed DEPENDS from poky * -sdk package from poky
Diffstat (limited to 'packages/xorg-lib/libpciaccess')
-rw-r--r--packages/xorg-lib/libpciaccess/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libpciaccess/fix-mtrr-check.patch19
2 files changed, 19 insertions, 0 deletions
diff --git a/packages/xorg-lib/libpciaccess/.mtn2git_empty b/packages/xorg-lib/libpciaccess/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libpciaccess/.mtn2git_empty
diff --git a/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch b/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch
new file mode 100644
index 0000000000..e2d9f62318
--- /dev/null
+++ b/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch
@@ -0,0 +1,19 @@
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- libpciaccess-0.10.3.orig/configure.ac
++++ libpciaccess-0.10.3/configure.ac
+@@ -89,12 +89,10 @@ esac
+ AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
+ AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
+ AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
+ AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
+
+-AC_CHECK_FILE([/usr/include/asm/mtrr.h],
+- [have_mtrr_h="yes"], [have_mtrr_h="no"])
+ if test "x$have_mtrr_h" = xyes; then
+ AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
+ fi
+
+ AC_SUBST(PCIACCESS_CFLAGS)