diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-05-06 15:08:13 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-05-08 19:03:34 +0200 |
| commit | cf971117eda3b7ec3c87b40490710a1456b28fb0 (patch) | |
| tree | a4dcfff12d0076dff10924ae2072e39ccc4ff226 /media-sound/yoshimi/files | |
| parent | media-gfx/kxstitch: Drop 2.1.1-r1 (diff) | |
| download | gentoo-cf971117eda3b7ec3c87b40490710a1456b28fb0.tar.gz gentoo-cf971117eda3b7ec3c87b40490710a1456b28fb0.tar.bz2 gentoo-cf971117eda3b7ec3c87b40490710a1456b28fb0.zip | |
media-sound/yoshimi: 1.5.10.2 version bump, EAPI-7 bump
Bug: https://bugs.gentoo.org/680684
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-sound/yoshimi/files')
| -rw-r--r-- | media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch new file mode 100644 index 000000000000..dc5544339b54 --- /dev/null +++ b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch @@ -0,0 +1,66 @@ +Respect user CXXFLAGS setting. + +--- a/src/CMakeLists.txt 2019-05-06 15:09:19.010755505 +0200 ++++ b/src/CMakeLists.txt 2019-05-06 15:14:11.668510627 +0200 +@@ -307,28 +307,28 @@ + endif(READLINE_FOUND) + + # set platform specific compiler flags +-if (BuildFor0ld_X86) +- set (OurCxxFlags ${BuildOptions_X86}) +-else (BuildFor0ld_X86) +- if (BuildForAMD_X86_64) +- set (OurCxxFlags ${BuildOptions_X86_64AMD}) +- else (BuildForAMD_X86_64) +- if (BuildForCore2_X86_64) +- set (OurCxxFlags ${BuildOptions_X86_64Core2}) +- else (BuildForCore2_X86_64) +- if (BuildForNEON) +- set (OurCxxFlags ${BuildOptions_NEON}) +- else (BuildForNEON) +- if (BuildForThisCPU) +- set (OurCxxFlags ${BuildOptionsThisCPU}) +- else (BuildForThisCPU) +- set (OurCxxFlags ${BuildOptionsBasic}) +- endif (BuildForThisCPU) +- endif (BuildForNEON) +- endif (BuildForCore2_X86_64) +- endif (BuildForAMD_X86_64) +-endif (BuildFor0ld_X86) +-set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}") ++# if (BuildFor0ld_X86) ++# set (OurCxxFlags ${BuildOptions_X86}) ++# else (BuildFor0ld_X86) ++# if (BuildForAMD_X86_64) ++# set (OurCxxFlags ${BuildOptions_X86_64AMD}) ++# else (BuildForAMD_X86_64) ++# if (BuildForCore2_X86_64) ++# set (OurCxxFlags ${BuildOptions_X86_64Core2}) ++# else (BuildForCore2_X86_64) ++# if (BuildForNEON) ++# set (OurCxxFlags ${BuildOptions_NEON}) ++# else (BuildForNEON) ++# if (BuildForThisCPU) ++# set (OurCxxFlags ${BuildOptionsThisCPU}) ++# else (BuildForThisCPU) ++# set (OurCxxFlags ${BuildOptionsBasic}) ++# endif (BuildForThisCPU) ++# endif (BuildForNEON) ++# endif (BuildForCore2_X86_64) ++# endif (BuildForAMD_X86_64) ++# endif (BuildFor0ld_X86) ++# set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}") + + if (BuildForDebug) + set (CMAKE_BUILD_TYPE "Debug") +@@ -330,8 +330,8 @@ + message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + else (BuildForDebug) + set (CMAKE_BUILD_TYPE "Release") +- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease}) +- message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") ++ # set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease}) ++ message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}") + endif (BuildForDebug) + + configure_file( |