diff options
Diffstat (limited to 'package/graphite2/0001-disable-double-promotion.patch')
-rw-r--r-- | package/graphite2/0001-disable-double-promotion.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/package/graphite2/0001-disable-double-promotion.patch b/package/graphite2/0001-disable-double-promotion.patch index 9199a6357b..3bda3d7c63 100644 --- a/package/graphite2/0001-disable-double-promotion.patch +++ b/package/graphite2/0001-disable-double-promotion.patch @@ -4,10 +4,11 @@ The warning flag isn't recognized for older GCC versions (blackfin), so just disable it. Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com> +[Gustavo: update for 1.3.5] -diff -Nura graphite2-1.3.3.orig/src/CMakeLists.txt graphite2-1.3.3/src/CMakeLists.txt ---- graphite2-1.3.3.orig/src/CMakeLists.txt 2015-09-24 10:06:28.877851596 -0300 -+++ graphite2-1.3.3/src/CMakeLists.txt 2015-09-24 10:06:48.201519767 -0300 +diff -Nura graphite2-1.3.5.orig/src/CMakeLists.txt graphite2-1.3.5/src/CMakeLists.txt +--- graphite2-1.3.5.orig/src/CMakeLists.txt 2016-02-15 11:46:45.941906112 -0300 ++++ graphite2-1.3.5/src/CMakeLists.txt 2016-02-15 11:46:54.237194222 -0300 @@ -111,9 +111,6 @@ COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector" LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" @@ -15,6 +16,6 @@ diff -Nura graphite2-1.3.3.orig/src/CMakeLists.txt graphite2-1.3.3/src/CMakeList - if (CMAKE_COMPILER_IS_GNUCXX) - add_definitions(-Wdouble-promotion) - endif (CMAKE_COMPILER_IS_GNUCXX) - if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") - target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32) - else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") + message(STATUS "Compiler ID is: ${CMAKE_CXX_COMPILER_ID}") + if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + add_definitions(-Wimplicit-fallthrough) |