forked from pool/graphite2
1fbf80286a
- graphite2-arm.patch :Fix build in arm and possible other platforms, we should notuse -nodefaultlibs as a linker flag and let the system do its job automatically. - freetype-devel should be freetype2-devel OBS-URL: https://build.opensuse.org/request/show/143480 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/graphite2?expand=0&rev=6
31 lines
1.7 KiB
Diff
31 lines
1.7 KiB
Diff
--- tests/CMakeLists.txt.orig
|
|
+++ tests/CMakeLists.txt
|
|
@@ -39,14 +39,12 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windo
|
|
COMPILE_DEFINITIONS "GRAPHITE2_STATIC;GRAPHITE2_NTRACING;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE")
|
|
else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
|
set_target_properties(graphite2-base PROPERTIES
|
|
- COMPILE_FLAGS "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions -fno-stack-protector"
|
|
+ COMPILE_FLAGS "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions"
|
|
COMPILE_DEFINITIONS "GRAPHITE2_STATIC"
|
|
- LINK_FLAGS "-nodefaultlibs"
|
|
LINKER_LANGUAGE C)
|
|
set_target_properties(graphite2-segcache PROPERTIES
|
|
- COMPILE_FLAGS "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions -fno-stack-protector"
|
|
+ COMPILE_FLAGS "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions"
|
|
COMPILE_DEFINITIONS "GRAPHITE2_STATIC;GRAPHITE2_NTRACING"
|
|
- LINK_FLAGS "-nodefaultlibs"
|
|
LINKER_LANGUAGE C)
|
|
endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
|
|
|
--- gr2fonttest/CMakeLists.txt.orig
|
|
+++ gr2fonttest/CMakeLists.txt
|
|
@@ -16,7 +16,7 @@ target_link_libraries(gr2fonttest graphi
|
|
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
|
# -lgcc LINKER_LANGUAGE C
|
|
add_definitions(-fno-rtti -fno-exceptions)
|
|
- set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nodefaultlibs" LINKER_LANGUAGE C)
|
|
+ set_target_properties(gr2fonttest PROPERTIES LINKER_LANGUAGE C)
|
|
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
|
|
# This script just fails
|
|
nolib_test(stdc++ $<TARGET_FILE:gr2fonttest>)
|