summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-07-29 11:11:10 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-07-29 11:11:10 +0000
commit2741816b11f52154ef32aab06565b8fab3fc490b (patch)
tree73aeb8366295daa80042d3d01405a401e409c257 /media-gfx/graphite2/files
parentCleanup (diff)
downloadgentoo-2-2741816b11f52154ef32aab06565b8fab3fc490b.tar.gz
gentoo-2-2741816b11f52154ef32aab06565b8fab3fc490b.tar.bz2
gentoo-2-2741816b11f52154ef32aab06565b8fab3fc490b.zip
Fix compilation under gcc-4.6. Fixes bug #376799.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/graphite2/files')
-rw-r--r--media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch b/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch
new file mode 100644
index 000000000000..233995647ce3
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch
@@ -0,0 +1,11 @@
+diff -urN graphite2-0.9.4.old/src/CMakeLists.txt graphite2-0.9.4/src/CMakeLists.txt
+--- graphite2-0.9.4.old/src/CMakeLists.txt 2011-07-29 12:53:36.000000000 +0200
++++ graphite2-0.9.4/src/CMakeLists.txt 2011-07-29 13:06:18.000000000 +0200
+@@ -166,7 +166,6 @@
+ -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fdiagnostics-show-option
+ -fno-rtti -fno-exceptions -nodefaultlibs -nostdlib
+ -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector)
+- set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nostdlib -nodefaultlibs" LINKER_LANGUAGE C)
+ if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+ target_link_libraries(graphite2 "-lkernel32 -lmsvcr90 -lmingw32 -lgcc -luser32")
+ else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")