1 |
scarabeus 11/07/29 10:14:59 |
2 |
|
3 |
Added: graphite2-fix-nostdlib.patch |
4 |
Log: |
5 |
Fix nostdlibs typo correctly everywhere, fixes part of the bug #376799. |
6 |
|
7 |
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-gfx/graphite2/files/graphite2-fix-nostdlib.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/files/graphite2-fix-nostdlib.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphite2/files/graphite2-fix-nostdlib.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: graphite2-fix-nostdlib.patch |
16 |
=================================================================== |
17 |
diff --git a/gr2fonttest/CMakeLists.txt b/gr2fonttest/CMakeLists.txt |
18 |
index 4e11217..89f97e4 100644 |
19 |
--- a/gr2fonttest/CMakeLists.txt |
20 |
+++ b/gr2fonttest/CMakeLists.txt |
21 |
@@ -45,7 +45,7 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") |
22 |
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") |
23 |
# -lgcc LINKER_LANGUAGE C |
24 |
add_definitions(-fno-rtti -fno-exceptions) |
25 |
- set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nostdlibs -nodefaultlibs" ) |
26 |
+ set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nostdlib -nodefaultlibs" ) |
27 |
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") |
28 |
# This script just fails |
29 |
nolib_test(stdc++ $<TARGET_FILE:gr2fonttest>) |
30 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
31 |
index 9c31e35..775a83b 100644 |
32 |
--- a/src/CMakeLists.txt |
33 |
+++ b/src/CMakeLists.txt |
34 |
@@ -164,9 +164,9 @@ set_target_properties(graphite2 PROPERTIES LT_VERSION_AGE ${GRAPHITE_API_AGE}) |
35 |
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") |
36 |
add_definitions(-Wall -Wno-unknown-pragmas -Wparentheses -Wextra -Wendif-labels |
37 |
-Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fdiagnostics-show-option |
38 |
- -fno-rtti -fno-exceptions -nodefaultlibs -nostdlibs |
39 |
+ -fno-rtti -fno-exceptions -nodefaultlibs -nostdlib |
40 |
-fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector) |
41 |
- set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nostdlibs -nodefaultlibs" LINKER_LANGUAGE C) |
42 |
+ set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nostdlib -nodefaultlibs" LINKER_LANGUAGE C) |
43 |
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") |
44 |
target_link_libraries(graphite2 "-lkernel32 -lmsvcr90 -lmingw32 -lgcc -luser32") |
45 |
else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") |