diff options
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/gdb-armulator/ChangeLog | 10 | ||||
| -rw-r--r-- | app-emulation/gdb-armulator/Manifest | 16 | ||||
| -rw-r--r-- | app-emulation/gdb-armulator/files/gdb-armulator-5.0-objstack.patch | 99 | ||||
| -rwxr-xr-x | app-emulation/gdb-armulator/files/gtk-config | 2 | ||||
| -rw-r--r-- | app-emulation/gdb-armulator/gdb-armulator-5.0.ebuild | 10 |
5 files changed, 131 insertions, 6 deletions
diff --git a/app-emulation/gdb-armulator/ChangeLog b/app-emulation/gdb-armulator/ChangeLog index 7241e7f804a3..bf2bf4c3adb4 100644 --- a/app-emulation/gdb-armulator/ChangeLog +++ b/app-emulation/gdb-armulator/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/gdb-armulator -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/gdb-armulator/ChangeLog,v 1.2 2007/01/25 22:09:38 genone Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/gdb-armulator/ChangeLog,v 1.3 2008/04/20 01:59:17 vapier Exp $ + + 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> + +files/gdb-armulator-5.0-objstack.patch, +files/gtk-config, + gdb-armulator-5.0.ebuild: + Fix building with newer versions of gcc #211463 by Ihar Hrachyshka and trick + the system to build with gtk-2 #211461 by Ihar Hrachyshka. 25 Jan 2007; Marius Mauch <genone@gentoo.org> gdb-armulator-5.0.ebuild: Replacing einfo with elog diff --git a/app-emulation/gdb-armulator/Manifest b/app-emulation/gdb-armulator/Manifest index e4ec49add47b..976b74e3b679 100644 --- a/app-emulation/gdb-armulator/Manifest +++ b/app-emulation/gdb-armulator/Manifest @@ -1,5 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX gdb-armulator-5.0-objstack.patch 3807 RMD160 343791d8e66519a4c679b1964208b8c4edfe7e89 SHA1 28bcd2f731a0b79241cf5e9c277c32a11450118e SHA256 d1f106951faf2f8850313f381241c17672d4eca52ab031e1f070b5c2f0f7a5f3 +AUX gtk-config 87 RMD160 372fe81433c28726f71cf99986c9142f20605433 SHA1 973a86ac03cd251315e7b0a7a72d23603f1823c5 SHA256 95dc7514f6a305656ca9b973321e02a0376e9397ad6ad323f65d7601cfd7f015 DIST gdb-5.0-uclinux-armulator-20021127.patch.gz 29618 RMD160 53025d84a598e3dc1df73a9bc5d9334d58fb8a4d SHA1 4c032aecc93d6f9a45aebc4d82872e9c24c6dde2 SHA256 aecd7028dfdb00a0f3581d78d6b334a773fa53e5d9e5dcf42ba041a43106d657 DIST gdb-5.0.tar.bz2 9505342 RMD160 b38b5e8ac98e6c4fd98999754e6fb5dd5fb4a38a SHA1 0c7f9a75113a338e7ada6e30738899a6c0c3caac SHA256 fcbb454be100d7d9deee7fd39010c72e94f4fccb57b69ba40433a41c21539a25 -EBUILD gdb-armulator-5.0.ebuild 1341 RMD160 5dcca063d4bbdca3510ba5ba2e0ce2d498812b5b SHA1 3dd863a29bcd9f246ac3c994fc1f69f12cfdef7a SHA256 525b13361f986244cc8146f9e2d1c5baef399f49741029dbad3d64da861261b7 -MISC ChangeLog 433 RMD160 d774b2ea226624d7beeff40e97ee91bd6e64fd75 SHA1 733bb08680075716cc73d52c1497e8b77333159d SHA256 728ddca10109d4b681812cb637bce017599dc85095ad9d0a2fb4b45ab24fec61 +EBUILD gdb-armulator-5.0.ebuild 1526 RMD160 31c42bad92630013707d845691d3308aa6cbe8bf SHA1 e64e42857b9b9ddfd78349fc3a4d63df86fae55c SHA256 b0c4751260ea559767b4450c74f14eb1c295c5554131181fb8dfd28a179dd701 +MISC ChangeLog 714 RMD160 c47cf6e540696ab266e97a794dc3704f1c14a6e8 SHA1 d2e5ec5ddea39bf865d51e87a515a64d4122a5d0 SHA256 ee329724cd073d6d6d8e708b54534f64d22d8b96e6763291687d4a8bec4c5775 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFICqN7j9hvisErhMIRAvZwAJ9IwweqgjqnfGupgwhqNVO4RscmrQCgtRvW +o4Zs5qzibvRbeX97tt9Yf1M= +=jHEO +-----END PGP SIGNATURE----- diff --git a/app-emulation/gdb-armulator/files/gdb-armulator-5.0-objstack.patch b/app-emulation/gdb-armulator/files/gdb-armulator-5.0-objstack.patch new file mode 100644 index 000000000000..9c00b047cea0 --- /dev/null +++ b/app-emulation/gdb-armulator/files/gdb-armulator-5.0-objstack.patch @@ -0,0 +1,99 @@ +--- gdb-5.0/include/obstack.h ++++ gdb-5.0/include/obstack.h +@@ -343,7 +343,7 @@ + + #endif + +-#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = achar) ++#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar)) + + #define obstack_blank_fast(h,n) ((h)->next_free += (n)) + +@@ -411,7 +411,7 @@ + ({ struct obstack *__o = (OBSTACK); \ + if (__o->next_free + 1 > __o->chunk_limit) \ + _obstack_newchunk (__o, 1); \ +- *(__o->next_free)++ = (datum); \ ++ obstack_1grow_fast (__o, datum); \ + (void) 0; }) + + /* These assume that the obstack alignment is good enough for pointers or ints, +@@ -423,19 +423,28 @@ + ({ struct obstack *__o = (OBSTACK); \ + if (__o->next_free + sizeof (void *) > __o->chunk_limit) \ + _obstack_newchunk (__o, sizeof (void *)); \ +- *((void **)__o->next_free)++ = ((void *)datum); \ +- (void) 0; }) ++ obstack_ptr_grow_fast (__o, datum); }) + + # define obstack_int_grow(OBSTACK,datum) \ + __extension__ \ + ({ struct obstack *__o = (OBSTACK); \ + if (__o->next_free + sizeof (int) > __o->chunk_limit) \ + _obstack_newchunk (__o, sizeof (int)); \ +- *((int *)__o->next_free)++ = ((int)datum); \ ++ obstack_int_grow_fast (__o, datum); }) ++ ++# define obstack_ptr_grow_fast(OBSTACK,aptr) \ ++__extension__ \ ++({ struct obstack *__o1 = (OBSTACK); \ ++ *(const void **) __o1->next_free = (aptr); \ ++ __o1->next_free += sizeof (const void *); \ + (void) 0; }) + +-# define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr) +-# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint) ++# define obstack_int_grow_fast(OBSTACK,aint) \ ++__extension__ \ ++({ struct obstack *__o1 = (OBSTACK); \ ++ *(int *) __o1->next_free = (aint); \ ++ __o1->next_free += sizeof (int); \ ++ (void) 0; }) + + # define obstack_blank(OBSTACK,length) \ + __extension__ \ +@@ -443,7 +452,7 @@ + int __len = (length); \ + if (__o->chunk_limit - __o->next_free < __len) \ + _obstack_newchunk (__o, __len); \ +- __o->next_free += __len; \ ++ obstack_blank_fast (__o, __len); \ + (void) 0; }) + + # define obstack_alloc(OBSTACK,length) \ +@@ -530,26 +539,29 @@ + # define obstack_1grow(h,datum) \ + ( (((h)->next_free + 1 > (h)->chunk_limit) \ + ? (_obstack_newchunk ((h), 1), 0) : 0), \ +- (*((h)->next_free)++ = (datum))) ++ obstack_1grow_fast (h, datum)) + + # define obstack_ptr_grow(h,datum) \ + ( (((h)->next_free + sizeof (char *) > (h)->chunk_limit) \ + ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0), \ +- (*((char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = ((char *) datum))) ++ obstack_ptr_grow_fast (h, datum)) + + # define obstack_int_grow(h,datum) \ + ( (((h)->next_free + sizeof (int) > (h)->chunk_limit) \ + ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0), \ +- (*((int *) (((h)->next_free+=sizeof(int))-sizeof(int))) = ((int) datum))) ++ obstack_int_grow_fast (h, datum)) ++ ++# define obstack_ptr_grow_fast(h,aptr) \ ++ (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr)) + +-# define obstack_ptr_grow_fast(h,aptr) (*((char **) (h)->next_free)++ = (char *) aptr) +-# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint) ++# define obstack_int_grow_fast(h,aint) \ ++ (((int *) ((h)->next_free += sizeof (int)))[-1] = (aptr)) + + # define obstack_blank(h,length) \ + ( (h)->temp = (length), \ + (((h)->chunk_limit - (h)->next_free < (h)->temp) \ + ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \ +- ((h)->next_free += (h)->temp)) ++ obstack_blank_fast (h, (h)->temp)) + + # define obstack_alloc(h,length) \ + (obstack_blank ((h), (length)), obstack_finish ((h))) diff --git a/app-emulation/gdb-armulator/files/gtk-config b/app-emulation/gdb-armulator/files/gtk-config new file mode 100755 index 000000000000..14cfa421b380 --- /dev/null +++ b/app-emulation/gdb-armulator/files/gtk-config @@ -0,0 +1,2 @@ +#!/bin/sh +exec pkg-config gtk+-2.0 $(printf "%s" "$*" | sed s:--version:--modversion:) diff --git a/app-emulation/gdb-armulator/gdb-armulator-5.0.ebuild b/app-emulation/gdb-armulator/gdb-armulator-5.0.ebuild index bddbeebe48f6..94ad17912a9a 100644 --- a/app-emulation/gdb-armulator/gdb-armulator-5.0.ebuild +++ b/app-emulation/gdb-armulator/gdb-armulator-5.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/gdb-armulator/gdb-armulator-5.0.ebuild,v 1.2 2007/01/25 22:09:38 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/gdb-armulator/gdb-armulator-5.0.ebuild,v 1.3 2008/04/20 01:59:17 vapier Exp $ inherit flag-o-matic eutils @@ -34,10 +34,16 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${WORKDIR}"/gdb-${PV}-uclinux-armulator-${STAMP}.patch + epatch "${FILESDIR}"/${P}-objstack.patch #211463 strip-linguas -u bfd/po opcodes/po + + # add a wrapper to fake gtk-1 with gtk-2 + mkdir "${T}"/path + cp "${FILESDIR}"/gtk-config "${T}"/path/ } src_compile() { + export PATH=${T}/path:${PATH} replace-flags -O? -O2 econf \ --disable-werror \ |