summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-04-09 17:14:47 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-04-09 17:14:47 +0000
commit6bd83a1532af5503290c1488b3d52e45d489c960 (patch)
tree80bd89c79df867e4a0e673dcee0a1b2da566c7b4 /x11-libs
parentVersion bump (diff)
downloadgentoo-2-6bd83a1532af5503290c1488b3d52e45d489c960.tar.gz
gentoo-2-6bd83a1532af5503290c1488b3d52e45d489c960.tar.bz2
gentoo-2-6bd83a1532af5503290c1488b3d52e45d489c960.zip
Fix build issues. Per bug #265549.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libdrm/ChangeLog6
-rw-r--r--x11-libs/libdrm/files/2.4.6-makefile.patch22
-rw-r--r--x11-libs/libdrm/libdrm-2.4.6.ebuild11
3 files changed, 37 insertions, 2 deletions
diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 463ac2a2132d..ba1b35fb57e5 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libdrm
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.70 2009/04/09 09:22:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.71 2009/04/09 17:14:46 scarabeus Exp $
+
+ 09 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org>
+ +files/2.4.6-makefile.patch, libdrm-2.4.6.ebuild:
+ Fix build issues. Per bug #265549.
*libdrm-2.4.6 (09 Apr 2009)
diff --git a/x11-libs/libdrm/files/2.4.6-makefile.patch b/x11-libs/libdrm/files/2.4.6-makefile.patch
new file mode 100644
index 000000000000..61bee916ca64
--- /dev/null
+++ b/x11-libs/libdrm/files/2.4.6-makefile.patch
@@ -0,0 +1,22 @@
+From 1faab66cfd1a854925da6ff7109aa614292dea90 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Mon, 06 Apr 2009 23:26:32 +0000
+Subject: drm: fix test makefile
+
+no idea if this is correct but it works so meh
+---
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index bc99447..e5e9fc4 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -2,6 +2,8 @@ AM_CFLAGS = \
+ -I $(top_srcdir)/shared-core \
+ -I $(top_srcdir)/libdrm
+
++AM_LDFLAGS = $(top_builddir)/libdrm/libdrm.la
++
+ noinst_PROGRAMS = \
+ dristat \
+ drmstat
+--
+cgit v0.8.2
diff --git a/x11-libs/libdrm/libdrm-2.4.6.ebuild b/x11-libs/libdrm/libdrm-2.4.6.ebuild
index 8316ed90832c..13e4117c9b9f 100644
--- a/x11-libs/libdrm/libdrm-2.4.6.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.6.ebuild,v 1.1 2009/04/09 09:22:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.6.ebuild,v 1.2 2009/04/09 17:14:46 scarabeus Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -18,8 +18,17 @@ RESTRICT="test" # see bug #236845
RDEPEND="dev-libs/libpthread-stubs"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PV}-makefile.patch
+)
# FIXME, we should try to see how we can fit the --enable-udev configure flag
+src_unpack() {
+ x-modular_src_unpack
+ eautoreconf
+ elibtoolize
+}
+
pkg_postinst() {
x-modular_pkg_postinst