diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-02-13 18:35:25 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-02-13 18:35:25 +0000 |
| commit | 1516b3783523106f3bccf83f6965b6118aa38e1b (patch) | |
| tree | e6af47a632015d0d1baa0f1a06c36a1b68de7fdf /sci-chemistry | |
| parent | version bump (diff) | |
| download | gentoo-2-1516b3783523106f3bccf83f6965b6118aa38e1b.tar.gz gentoo-2-1516b3783523106f3bccf83f6965b6118aa38e1b.tar.bz2 gentoo-2-1516b3783523106f3bccf83f6965b6118aa38e1b.zip | |
sci-chemistry/avogadro: add another missing fPIC, #446548; thanks Oldrich Jedlicka and Todd Goodman for the patch
(Portage version: 2.2.0_alpha162/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/avogadro/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch | 16 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/metadata.xml | 10 |
3 files changed, 26 insertions, 7 deletions
diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog index 6a96b00971bb..ba1a04e1e9ca 100644 --- a/sci-chemistry/avogadro/ChangeLog +++ b/sci-chemistry/avogadro/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-chemistry/avogadro # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.42 2013/02/08 12:25:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.43 2013/02/13 18:35:25 jlec Exp $ + + 13 Feb 2013; Justin Lecher <jlec@gentoo.org> + files/avogadro-1.1.0-textrel.patch, metadata.xml: + add another missing fPIC, #446548; thanks Oldrich Jedlicka and Todd Goodman + for the patch 08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> avogadro-1.0.3-r1.ebuild: Add ~ppc, wrt bug #455960 diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch index 5b5cf0e4dc17..2a9b2e14a2a8 100644 --- a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch +++ b/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch @@ -1,5 +1,6 @@ libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt index fb88316..2ddcfdf 100644 @@ -13,3 +14,16 @@ index fb88316..2ddcfdf 100644 +if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(i.86|x86|x86_64)$") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" ) endif() +diff --git a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt +index 0cd0c3e..9e89daf 100644 +--- a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt ++++ b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt +@@ -19,7 +19,7 @@ add_library(tubegen STATIC ${tubegen_SRCS}) + set_target_properties(tubegen PROPERTIES COMPILE_FLAGS "-w") + + # Set -fPIC on x86_64 +-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") ++if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(i.86|x86|x86_64)$") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" ) + endif() diff --git a/sci-chemistry/avogadro/metadata.xml b/sci-chemistry/avogadro/metadata.xml index c478c239e306..b0721418598d 100644 --- a/sci-chemistry/avogadro/metadata.xml +++ b/sci-chemistry/avogadro/metadata.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci-chemistry</herd> - <longdescription> + <herd>sci-chemistry</herd> + <longdescription> Avogadro is an advanced molecular editor designed for cross-platform use in computational chemistry, molecular modeling, bioinformatics, materials science, and related areas. It offers flexible rendering and a powerful plugin architecture. </longdescription> - <use> - <flag name="glsl">Enable glsl features via GLEW.</flag> - </use> + <use> + <flag name="glsl">Enable glsl features via GLEW.</flag> + </use> </pkgmetadata> |