summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-03-14 12:58:04 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-03-14 12:58:04 +0100
commit826d63426bfaed884748c2d5e23b9c519aac51b5 (patch)
tree8f393f64656680759852567f00b1a50a083329a2 /extra
parent1c4265842c1629043d95942db587ecf5b34df854 (diff)
Use upstream patch to fix libpciaccess build.
Diffstat (limited to 'extra')
-rw-r--r--extra/libpciaccess/PKGBUILD7
-rw-r--r--extra/libpciaccess/libpciaccess-0.13-io.patch26
2 files changed, 31 insertions, 2 deletions
diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD
index aa6e4278f..eef9c2fc6 100644
--- a/extra/libpciaccess/PKGBUILD
+++ b/extra/libpciaccess/PKGBUILD
@@ -12,11 +12,14 @@ url="http://xorg.freedesktop.org/"
depends=('glibc')
makedepends=('pkgconfig' 'xorg-util-macros')
options=('!libtool')
-source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353')
+source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
+ libpciaccess-0.13-io.patch)
+sha1sums=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353'
+ '614be5f7328b18f00e456eb99082ee3b634e7fa9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i "$srcdir/libpciaccess-0.13-io.patch"
./configure --prefix=/usr --sysconfdir=/etc
make
}
diff --git a/extra/libpciaccess/libpciaccess-0.13-io.patch b/extra/libpciaccess/libpciaccess-0.13-io.patch
new file mode 100644
index 000000000..e6a498d76
--- /dev/null
+++ b/extra/libpciaccess/libpciaccess-0.13-io.patch
@@ -0,0 +1,26 @@
+From b16336c0b389ace07f7418f5a021bfbc68fec2b6 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 05 Mar 2012 16:01:01 +0000
+Subject: linux: Fix out[bwl] macros on non-I/O architectures
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
+index b817860..97fcf36 100644
+--- a/src/linux_sysfs.c
++++ b/src/linux_sysfs.c
+@@ -51,9 +51,9 @@
+ #define inb(x) -1
+ #define inw(x) -1
+ #define inl(x) -1
+-#define outb(x) do {} while (0)
+-#define outw(x) do {} while (0)
+-#define outl(x) do {} while (0)
++#define outb(x,y) do {} while (0)
++#define outw(x,y) do {} while (0)
++#define outl(x,y) do {} while (0)
+ #define iopl(x) -1
+ #endif
+
+--
+cgit v0.9.0.2-2-gbebe