diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2021-03-12 20:54:08 +0100 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2021-03-13 09:30:53 +0200 |
| commit | 035cffeb173bd85dba3276158e18f03a9609ed19 (patch) | |
| tree | 436827bfe64a213ad97dc937705c90651e933f24 /media-gfx/yafaray | |
| parent | dev-python/pycollada: add support for python 3.9 (diff) | |
| download | gentoo-035cffeb173bd85dba3276158e18f03a9609ed19.tar.gz gentoo-035cffeb173bd85dba3276158e18f03a9609ed19.tar.bz2 gentoo-035cffeb173bd85dba3276158e18f03a9609ed19.zip | |
media-gfx/yafaray: respect CFLAGS
Closes: https://bugs.gentoo.org/774858
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19900
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-gfx/yafaray')
| -rw-r--r-- | media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch | 39 | ||||
| -rw-r--r-- | media-gfx/yafaray/yafaray-3.5.1.ebuild | 4 |
2 files changed, 43 insertions, 0 deletions
diff --git a/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch b/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch new file mode 100644 index 000000000000..67cb8ca3aad2 --- /dev/null +++ b/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch @@ -0,0 +1,39 @@ +From 2f7e31a06679798c15f737b2725d246a12bcc6b4 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Fri, 12 Mar 2021 20:43:20 +0100 +Subject: [PATCH] respect distribution CFLAGS + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 00dfda9..ade65a7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -234,18 +234,18 @@ if(NOT WIN32) + endif(NOT YAF_BINDINGS_RUBY_DIR) + + # build flags +- set(CMAKE_CXX_FLAGS "-Wall -Wno-unused-result" CACHE STRING "Default compiler flags" FORCE) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-result" CACHE STRING "Default compiler flags" FORCE) + + if(USER_RELEASE_OPTIMIZATION_FLAGS) + set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS}) + else(USER_RELEASE_OPTIMIZATION_FLAGS) +- set(YAF_CXX_FLAGS_RELEASE "-Wall -std=c++11 -pthread -O3 -ffast-math -Wno-unused-result") ++ set(YAF_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -std=c++11 -pthread -O3 -ffast-math -Wno-unused-result") + endif(USER_RELEASE_OPTIMIZATION_FLAGS) + + if(USER_DEBUG_OPTIMIZATION_FLAGS) + set(YAF_CXX_FLAGS_DEBUG ${USER_DEBUG_OPTIMIZATION_FLAGS}) + else(USER_DEBUG_OPTIMIZATION_FLAGS) +- set(YAF_CXX_FLAGS_DEBUG "-Wall -std=c++11 -pthread -ggdb -Wno-unused-result") ++ set(YAF_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -std=c++11 -pthread -ggdb -Wno-unused-result") + endif(USER_DEBUG_OPTIMIZATION_FLAGS) + + if(APPLE) +-- +2.30.1 + diff --git a/media-gfx/yafaray/yafaray-3.5.1.ebuild b/media-gfx/yafaray/yafaray-3.5.1.ebuild index cca93fade785..2b65a4e8f72e 100644 --- a/media-gfx/yafaray/yafaray-3.5.1.ebuild +++ b/media-gfx/yafaray/yafaray-3.5.1.ebuild @@ -46,6 +46,10 @@ BDEPEND="python? ( dev-lang/swig )" +PATCHES=( + "${FILESDIR}"/${P}-0001-respect-distribution-CFLAGS.patch +) + DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md ) pkg_setup() { |