diff options
author | Carsten Lohrke <carlo@gentoo.org> | 2004-07-24 21:52:55 +0000 |
---|---|---|
committer | Carsten Lohrke <carlo@gentoo.org> | 2004-07-24 21:52:55 +0000 |
commit | 711d130ce4593dd66a4a3ea00df0bfec74fa7aeb (patch) | |
tree | e6368b7cd2a259fedee08f36ab66771c8eaeb5e5 /dev-util | |
parent | header fix (diff) | |
download | historical-711d130ce4593dd66a4a3ea00df0bfec74fa7aeb.tar.gz historical-711d130ce4593dd66a4a3ea00df0bfec74fa7aeb.tar.bz2 historical-711d130ce4593dd66a4a3ea00df0bfec74fa7aeb.zip |
header fix, #58013
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/kdevelop/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/kdevelop/Manifest | 13 | ||||
-rw-r--r-- | dev-util/kdevelop/files/kdevelop-3.1_beta2-mutex.h.diff | 20 | ||||
-rw-r--r-- | dev-util/kdevelop/kdevelop-3.1_beta2.ebuild | 3 |
4 files changed, 34 insertions, 8 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/Manifest b/dev-util/kdevelop/Manifest index feea1efe6bc1..f15ff6936dbc 100644 --- a/dev-util/kdevelop/Manifest +++ b/dev-util/kdevelop/Manifest @@ -1,11 +1,12 @@ -MD5 66667e5b7e3f146c6958dae05c0ea9d5 ChangeLog 9989 +MD5 d9b6820dff9f5513f533b39f5ca54878 kdevelop-3.1_beta2.ebuild 2777 MD5 ca4cd8dcf6038690faaaf0ceae77b037 kdevelop-2.1.5.ebuild 2017 -MD5 2784a1db76d3eedfa3838e0efeb23c0e kdevelop-3.1_beta2.ebuild 2739 -MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 95f96f28097682a2ef07f7298faff963 kdevelop-3.0.4.ebuild 2572 +MD5 9bb9015ac6bdbe3513e419b93ab146f8 ChangeLog 10124 +MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 5844083f843db38cd01fa7a77d677e51 files/digest-kdevelop-2.1.5 245 -MD5 34aecfc4568e3f2cc41caca08bf3ab71 files/digest-kdevelop-3.1_beta2 69 -MD5 5dbe87ca31912cf4eeba60fb16082225 files/htdig.conf 8248 -MD5 5508874c2fcaa48c79c78529b07aced2 files/kdevelop-2.1.5-gentoo.diff 4536 MD5 6a803afe94792dfe48514e5559f2c1cb files/digest-kdevelop-3.0.4 68 +MD5 5508874c2fcaa48c79c78529b07aced2 files/kdevelop-2.1.5-gentoo.diff 4536 +MD5 13c22bb7e87fe94cfe176813a148d84b files/kdevelop-3.1_beta2-mutex.h.diff 656 MD5 dcdcaf1dea68db854de8dad4df83c096 files/kdevelop-3.1_beta1-bdb-fPIC.patch 391 +MD5 34aecfc4568e3f2cc41caca08bf3ab71 files/digest-kdevelop-3.1_beta2 69 +MD5 5dbe87ca31912cf4eeba60fb16082225 files/htdig.conf 8248 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 |