diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-01-05 06:23:34 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-05 06:23:34 +0000 |
| commit | 1a65deba5cb3b33bfc262dc85f3a18a54b7658e0 (patch) | |
| tree | 46c0982681049f3c898cba5eb6a64b4943eca1f1 /dev-lang | |
| parent | Adding ~ppc (diff) | |
| download | gentoo-2-1a65deba5cb3b33bfc262dc85f3a18a54b7658e0.tar.gz gentoo-2-1a65deba5cb3b33bfc262dc85f3a18a54b7658e0.tar.bz2 gentoo-2-1a65deba5cb3b33bfc262dc85f3a18a54b7658e0.zip | |
Fix building of xvid with elf-visibility patch #116398.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/nasm/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-lang/nasm/files/digest-nasm-0.98.39-r3 (renamed from dev-lang/nasm/files/digest-nasm-0.98.39-r2) | 0 | ||||
| -rw-r--r-- | dev-lang/nasm/files/nasm-0.98.39-elf-visibility.patch | 11 | ||||
| -rw-r--r-- | dev-lang/nasm/nasm-0.98.39-r3.ebuild (renamed from dev-lang/nasm/nasm-0.98.39-r2.ebuild) | 4 |
4 files changed, 16 insertions, 10 deletions
diff --git a/dev-lang/nasm/ChangeLog b/dev-lang/nasm/ChangeLog index bcb4adb40b32..46a04010e437 100644 --- a/dev-lang/nasm/ChangeLog +++ b/dev-lang/nasm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/nasm -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.38 2005/12/17 01:08:18 vapier Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.39 2006/01/05 06:23:34 vapier Exp $ + +*nasm-0.98.39-r3 (05 Jan 2006) + + 05 Jan 2006; Mike Frysinger <vapier@gentoo.org> + files/nasm-0.98.39-elf-visibility.patch, -nasm-0.98.39-r2.ebuild, + +nasm-0.98.39-r3.ebuild: + Fix building of xvid with elf-visibility patch #116398. *nasm-0.98.39-r2 (17 Dec 2005) diff --git a/dev-lang/nasm/files/digest-nasm-0.98.39-r2 b/dev-lang/nasm/files/digest-nasm-0.98.39-r3 index 6e9a89fbc65a..6e9a89fbc65a 100644 --- a/dev-lang/nasm/files/digest-nasm-0.98.39-r2 +++ b/dev-lang/nasm/files/digest-nasm-0.98.39-r3 diff --git a/dev-lang/nasm/files/nasm-0.98.39-elf-visibility.patch b/dev-lang/nasm/files/nasm-0.98.39-elf-visibility.patch index 07320eb35467..d4f1948b5d06 100644 --- a/dev-lang/nasm/files/nasm-0.98.39-elf-visibility.patch +++ b/dev-lang/nasm/files/nasm-0.98.39-elf-visibility.patch @@ -42,15 +42,15 @@ http://sourceforge.net/mailarchive/forum.php?thread_id=9230919&forum_id=4978 sym->size = 0; if (segment == NO_SEG) sym->section = SHN_ABS; -@@ -570,18 +578,41 @@ static void elf_deflabel(char *name, lon +@@ -570,18 +578,39 @@ static void elf_deflabel(char *name, lon sym->next = sects[sym->section - 1]->gsyms; sects[sym->section - 1]->gsyms = sym; + /* ELF syntax: GLOBAL name[:type [visibility]] */ if (special) { - int n = strcspn(special, " "); +- + int n = strcspn(special, " \t"); - if (!nasm_strnicmp(special, "function", n)) sym->type |= SYM_FUNCTION; else if (!nasm_strnicmp(special, "data", n) || @@ -76,8 +76,7 @@ http://sourceforge.net/mailarchive/forum.php?thread_id=9230919&forum_id=4978 + else if (!nasm_strnicmp(special, "protected", n)) + sym->other = STV_PROTECTED; + else -+ error(ERR_NONFATAL, "unrecognised symbol type `%.*s'", -+ n, special); ++ n = 0; + special += n; + } + @@ -86,7 +85,7 @@ http://sourceforge.net/mailarchive/forum.php?thread_id=9230919&forum_id=4978 struct tokenval tokval; expr *e; int fwd = FALSE; -@@ -1120,7 +1150,8 @@ static struct SAA *elf_build_symtab(long +@@ -1120,7 +1149,8 @@ static struct SAA *elf_build_symtab(long WRITELONG(p, sym->strpos); WRITELONG(p, sym->value); WRITELONG(p, sym->size); @@ -96,7 +95,7 @@ http://sourceforge.net/mailarchive/forum.php?thread_id=9230919&forum_id=4978 WRITESHORT(p, sym->section); saa_wbytes(s, entry, 16L); *len += 16; -@@ -1138,7 +1169,8 @@ static struct SAA *elf_build_symtab(long +@@ -1138,7 +1168,8 @@ static struct SAA *elf_build_symtab(long WRITELONG(p, sym->strpos); WRITELONG(p, sym->value); WRITELONG(p, sym->size); diff --git a/dev-lang/nasm/nasm-0.98.39-r2.ebuild b/dev-lang/nasm/nasm-0.98.39-r3.ebuild index 24969f10eab2..8e858d6840be 100644 --- a/dev-lang/nasm/nasm-0.98.39-r2.ebuild +++ b/dev-lang/nasm/nasm-0.98.39-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.39-r2.ebuild,v 1.2 2005/12/26 08:02:31 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.39-r3.ebuild,v 1.1 2006/01/05 06:23:34 vapier Exp $ inherit eutils toolchain-funcs |