summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2004-07-24 21:52:55 +0000
committerCarsten Lohrke <carlo@gentoo.org>2004-07-24 21:52:55 +0000
commit5b4457508d0aa0c97a15d0457ce4eedf8f85def3 (patch)
tree067308798786854efcb3ccd7fcfa3dbf9a0556ff /dev-util
parentheader fix (Manifest recommit) (diff)
downloadgentoo-2-5b4457508d0aa0c97a15d0457ce4eedf8f85def3.tar.gz
gentoo-2-5b4457508d0aa0c97a15d0457ce4eedf8f85def3.tar.bz2
gentoo-2-5b4457508d0aa0c97a15d0457ce4eedf8f85def3.zip
header fix, #58013
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/kdevelop/ChangeLog6
-rw-r--r--dev-util/kdevelop/files/kdevelop-3.1_beta2-mutex.h.diff20
-rw-r--r--dev-util/kdevelop/kdevelop-3.1_beta2.ebuild3
3 files changed, 27 insertions, 2 deletions
diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 888325be4100..4d647ec95e29 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/kdevelop
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.59 2004/07/23 09:19:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.60 2004/07/24 21:52:55 carlo Exp $
+
+ 24 Jul 2004; Carsten Lohrke <carlo@gentoo.org>
+ +files/kdevelop-3.1_beta2-mutex.h.diff, kdevelop-3.1_beta2.ebuild:
+ header fix, #58013
23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
kdevelop-3.0.4.ebuild:
diff --git a/dev-util/kdevelop/files/kdevelop-3.1_beta2-mutex.h.diff b/dev-util/kdevelop/files/kdevelop-3.1_beta2-mutex.h.diff
new file mode 100644
index 000000000000..df7636065627
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.1_beta2-mutex.h.diff
@@ -0,0 +1,20 @@
+--- bdb/include/mutex.h.orig 2004-07-24 21:34:02.164952224 +0200
++++ bdb/include/mutex.h 2004-07-24 21:34:37.961510320 +0200
+@@ -486,7 +486,7 @@
+ int __one = 1; \
+ int __r; \
+ tsl_t *__l = (tsl); \
+- asm volatile (" \
++ __asm volatile (" \
+ 0: \
+ lwarx %0,0,%1; \
+ cmpwi %0,0; \
+@@ -621,7 +621,7 @@
+ #define MUTEX_SET(tsl) ({ \
+ register tsl_t *__l = (tsl); \
+ int __r; \
+- asm volatile("mov $1,%%rax; lock; xchgb %1,%%al; xor $1,%%rax"\
++ __asm volatile("mov $1,%%rax; lock; xchgb %1,%%al; xor $1,%%rax"\
+ : "=&a" (__r), "=m" (*__l) \
+ : "1" (*__l) \
+ ); \
diff --git a/dev-util/kdevelop/kdevelop-3.1_beta2.ebuild b/dev-util/kdevelop/kdevelop-3.1_beta2.ebuild
index 814b5927f915..91f5673ef066 100644
--- a/dev-util/kdevelop/kdevelop-3.1_beta2.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.1_beta2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.1_beta2.ebuild,v 1.1 2004/07/22 20:49:17 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.1_beta2.ebuild,v 1.2 2004/07/24 21:52:55 carlo Exp $
inherit python kde eutils
@@ -29,6 +29,7 @@ myconf="$myconf --with-kdelibsdoxy-dir=${KDEDIR}/share/doc/HTML/en/kdelibs-apido
src_unpack() {
kde_src_unpack
+ epatch ${FILESDIR}/${P}-mutex.h.diff
if use amd64; then
epatch ${FILESDIR}/${P/beta?/beta1}-bdb-fPIC.patch
fi