diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-03-31 15:51:54 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-03-31 15:51:54 +0000 |
| commit | e7978e9a11e5e0ece98b97070827f65c9c8bc287 (patch) | |
| tree | cc5b53a3a99758b4bd3d9cfade76ad69a17a23b7 /media-gfx | |
| parent | Stable for amd64, wrt bug #462890 (diff) | |
| download | gentoo-2-e7978e9a11e5e0ece98b97070827f65c9c8bc287.tar.gz gentoo-2-e7978e9a11e5e0ece98b97070827f65c9c8bc287.tar.bz2 gentoo-2-e7978e9a11e5e0ece98b97070827f65c9c8bc287.zip | |
fix clang build
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'media-gfx')
3 files changed, 27 insertions, 2 deletions
diff --git a/media-gfx/nvidia-texture-tools/ChangeLog b/media-gfx/nvidia-texture-tools/ChangeLog index a4b0008038d1..5a840a4f15b1 100644 --- a/media-gfx/nvidia-texture-tools/ChangeLog +++ b/media-gfx/nvidia-texture-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/nvidia-texture-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/ChangeLog,v 1.9 2013/03/21 01:24:41 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/ChangeLog,v 1.10 2013/03/31 15:51:54 hasufell Exp $ + + 31 Mar 2013; Julian Ospald <hasufell@gentoo.org> + nvidia-texture-tools-2.0.8-r2.ebuild, + +files/nvidia-texture-tools-2.0.8-clang.patch: + fix clang build 21 Mar 2013; Julian Ospald <hasufell@gentoo.org> nvidia-texture-tools-2.0.8-r2.ebuild: diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-clang.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-clang.patch new file mode 100644 index 000000000000..373c87e4171b --- /dev/null +++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-clang.patch @@ -0,0 +1,18 @@ +Index: src/src/nvtt/squish/CMakeLists.txt +=================================================================== +--- src/src/nvtt/squish/CMakeLists.txt (revision 13060) ++++ src/src/nvtt/squish/CMakeLists.txt (working copy) +@@ -22,7 +22,11 @@
+ + ADD_LIBRARY(squish STATIC ${SQUISH_SRCS}) + +-IF(CMAKE_COMPILER_IS_GNUCXX) ++IF("${CMAKE_CXX_COMPILER}" MATCHES "clang(\\+\\+)?$" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") ++ SET(CMAKE_COMPILER_IS_CLANGXX 1) ++ENDIF() ++ ++IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) + SET_TARGET_PROPERTIES(squish PROPERTIES COMPILE_FLAGS -fPIC) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX) ++ENDIF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) + diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild index d689f6b57887..18d7e6ae8270 100644 --- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild +++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild,v 1.2 2013/03/21 01:24:41 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild,v 1.3 2013/03/31 15:51:54 hasufell Exp $ EAPI=4 inherit cmake-utils eutils multilib toolchain-funcs @@ -51,6 +51,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-gcc-4.7.patch # fix bug #462494 epatch "${FILESDIR}"/${P}-openexr.patch + # fix clang build + epatch "${FILESDIR}"/${P}-clang.patch } src_configure() { |