diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-11-24 09:12:21 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-11-24 09:12:21 +0000 |
| commit | 06fbf1c0fcc04358062af87bd2178511afefd886 (patch) | |
| tree | 785573b79b8c6e8f4464ac68de58c00c3a19dbd0 | |
| parent | Fix install_name pointer to libLLVM-x.y.dylib in a more flexible way to avoid... (diff) | |
| download | gentoo-2-06fbf1c0fcc04358062af87bd2178511afefd886.tar.gz gentoo-2-06fbf1c0fcc04358062af87bd2178511afefd886.tar.bz2 gentoo-2-06fbf1c0fcc04358062af87bd2178511afefd886.zip | |
Fix compilation against glbc-2.1.4 (changed declaration of type for __malloc_initialize_hook from void to volatile
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
| -rw-r--r-- | sci-biology/ncbi-tools++/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-glibc-214.patch | 22 | ||||
| -rw-r--r-- | sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild | 5 |
3 files changed, 32 insertions, 3 deletions
diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog index b8367ea39859..b00919e4ef5f 100644 --- a/sci-biology/ncbi-tools++/ChangeLog +++ b/sci-biology/ncbi-tools++/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-biology/ncbi-tools++ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.21 2011/09/23 09:43:25 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.22 2011/11/24 09:12:21 jlec Exp $ + + 24 Nov 2011; Justin Lecher <jlec@gentoo.org> + ncbi-tools++-2010.06.15-r1.ebuild, + +files/ncbi-tools++-2010.06.15-glibc-214.patch: + Fix compilation against glbc-2.1.4 (changed declaration of type for + __malloc_initialize_hook from void to volatile 23 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> ncbi-tools++-2010.06.15-r1.ebuild, diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-glibc-214.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-glibc-214.patch new file mode 100644 index 000000000000..2275cdefb550 --- /dev/null +++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-glibc-214.patch @@ -0,0 +1,22 @@ + src/app/netcache/nc_memory.cpp | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/src/app/netcache/nc_memory.cpp b/src/app/netcache/nc_memory.cpp +index bb602ee..468b44d 100644 +--- a/src/app/netcache/nc_memory.cpp ++++ b/src/app/netcache/nc_memory.cpp +@@ -3329,7 +3329,13 @@ void s_NCInitMallocHook(void) + __free_hook = s_NCFreeHook; + } + +-void (*__malloc_initialize_hook) (void) = s_NCInitMallocHook; ++/* GNU libc 2.14 defines this macro to declare hook variables as volatile. ++ Define it as empty for older libc versions. */ ++#ifndef __MALLOC_HOOK_VOLATILE ++# define __MALLOC_HOOK_VOLATILE ++#endif ++ ++void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void) = s_NCInitMallocHook; + + #elif !defined(NCBI_OS_MSWIN) + // Changing of C library allocation functions on Windows is very tricky (if diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild index 2b5a6cd58f3c..3c395d397c4a 100644 --- a/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild +++ b/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild,v 1.3 2011/09/23 09:43:25 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild,v 1.4 2011/11/24 09:12:21 jlec Exp $ EAPI="3" @@ -37,7 +37,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-gcc46.patch \ "${WORKDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-libpng15.patch + "${FILESDIR}"/${P}-libpng15.patch \ + "${FILESDIR}"/${P}-glibc-214.patch } src_configure() { |