- updated to 1.3.10

[packages/graphite2.git] / graphite2-fix_wrong_linker_opts.patch

diff --git a/graphite2-fix_wrong_linker_opts.patch b/graphite2-fix_wrong_linker_opts.patch
index f9d9eb76e36d4f468a1969cef6171fa163be0f25..e56fb305e5fda8181d60b8113aaeb41e762e9cd6 100644 (file)
--- a/graphite2-fix_wrong_linker_opts.patch
+++ b/graphite2-fix_wrong_linker_opts.patch
@@ -1,12 +1,27 @@
---- graphite2-1.3.1/src/CMakeLists.txt.orig    2015-09-05 14:35:43.749986744 +0200
-+++ graphite2-1.3.1/src/CMakeLists.txt 2015-09-05 14:48:30.546621231 +0200
-@@ -110,8 +110,7 @@
+--- graphite2-1.3.10/src/CMakeLists.txt.orig   2017-05-09 18:14:22.142733949 +0200
++++ graphite2-1.3.10/src/CMakeLists.txt        2017-05-09 18:27:36.209391572 +0200
+@@ -109,11 +109,7 @@
  if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
      set_target_properties(graphite2 PROPERTIES 
          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}" 
 -        LINKER_LANGUAGE C)
+-    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+-        add_definitions(-mfpmath=sse -msse2)
+-    endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
 +        )
      if (CMAKE_COMPILER_IS_GNUCXX)
          add_definitions(-Wdouble-promotion)
      endif (CMAKE_COMPILER_IS_GNUCXX)
+@@ -124,11 +120,6 @@
+     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+         target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
+     else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+-        if (GRAPHITE2_ASAN)
+-            target_link_libraries(graphite2 c gcc_s)
+-        else (GRAPHITE2_ASAN)
+-            target_link_libraries(graphite2 c gcc)
+-        endif (GRAPHITE2_ASAN)
+         include(Graphite)
+         nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+     endif (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")