diff options
| author | davidovski <david@davidovski.xyz> | 2022-04-17 22:07:52 +0100 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-04-17 22:07:52 +0100 |
| commit | c35d083dc525e223b085ec00e6863ea6eafb003c (patch) | |
| tree | 5bbe25b4f92cd1821c8cbbefed9c19de6e42b98e /extra/graphite/cmake.patch | |
| parent | 7cc715c1249422ddf91987be64a35eef43e3e62d (diff) | |
updated musl
Diffstat (limited to 'extra/graphite/cmake.patch')
| -rw-r--r-- | extra/graphite/cmake.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/extra/graphite/cmake.patch b/extra/graphite/cmake.patch new file mode 100644 index 0000000..2b21d6b --- /dev/null +++ b/extra/graphite/cmake.patch @@ -0,0 +1,23 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b6ac26b..0371b0c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -120,11 +120,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") + target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32) + else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") +- if (GRAPHITE2_SANITIZERS) +- target_link_libraries(graphite2 c gcc_s) +- else () +- target_link_libraries(graphite2 c gcc) +- endif () ++ target_link_libraries(graphite2 c gcc_s -lssp_nonshared) + endif() + include(Graphite) + if (BUILD_SHARED_LIBS) +@@ -156,4 +152,4 @@ endif() + + + install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin) +-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_) ++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/cmake/graphite2 NAMESPACE gr2_) |