diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-29 10:14:59 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-29 10:14:59 +0000 |
| commit | 1c47c37583dd2626f9c9acdfeeb5d63ffd58ce67 (patch) | |
| tree | 0b71c5ea80ed0d3f6294945c7cb068f948d41891 /media-gfx | |
| parent | Use lrdf.pc to gain -I/usr/include/raptor2 (lrdf.h -> raptor.h) (diff) | |
| download | gentoo-2-1c47c37583dd2626f9c9acdfeeb5d63ffd58ce67.tar.gz gentoo-2-1c47c37583dd2626f9c9acdfeeb5d63ffd58ce67.tar.bz2 gentoo-2-1c47c37583dd2626f9c9acdfeeb5d63ffd58ce67.zip | |
Fix nostdlibs typo correctly everywhere, fixes part of the bug #376799.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/graphite2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/graphite2/files/graphite2-fix-nostdlib.patch | 29 | ||||
| -rw-r--r-- | media-gfx/graphite2/graphite2-0.9.4-r1.ebuild | 8 |
3 files changed, 36 insertions, 7 deletions
diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog index 3904d40d5f0a..b2fafb003e4c 100644 --- a/media-gfx/graphite2/ChangeLog +++ b/media-gfx/graphite2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/graphite2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.6 2011/07/28 19:26:22 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.7 2011/07/29 10:14:59 scarabeus Exp $ + + 29 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> + +files/graphite2-fix-nostdlib.patch, graphite2-0.9.4-r1.ebuild: + Fix nostdlibs typo correctly everywhere, fixes part of the bug #376799. 28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> graphite2-0.9.4-r1.ebuild: diff --git a/media-gfx/graphite2/files/graphite2-fix-nostdlib.patch b/media-gfx/graphite2/files/graphite2-fix-nostdlib.patch new file mode 100644 index 000000000000..7b7c80b47b64 --- /dev/null +++ b/media-gfx/graphite2/files/graphite2-fix-nostdlib.patch @@ -0,0 +1,29 @@ +diff --git a/gr2fonttest/CMakeLists.txt b/gr2fonttest/CMakeLists.txt +index 4e11217..89f97e4 100644 +--- a/gr2fonttest/CMakeLists.txt ++++ b/gr2fonttest/CMakeLists.txt +@@ -45,7 +45,7 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + # -lgcc LINKER_LANGUAGE C + add_definitions(-fno-rtti -fno-exceptions) +- set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nostdlibs -nodefaultlibs" ) ++ set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nostdlib -nodefaultlibs" ) + set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") + # This script just fails + nolib_test(stdc++ $<TARGET_FILE:gr2fonttest>) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9c31e35..775a83b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -164,9 +164,9 @@ set_target_properties(graphite2 PROPERTIES LT_VERSION_AGE ${GRAPHITE_API_AGE}) + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + add_definitions(-Wall -Wno-unknown-pragmas -Wparentheses -Wextra -Wendif-labels + -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fdiagnostics-show-option +- -fno-rtti -fno-exceptions -nodefaultlibs -nostdlibs ++ -fno-rtti -fno-exceptions -nodefaultlibs -nostdlib + -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector) +- set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nostdlibs -nodefaultlibs" LINKER_LANGUAGE C) ++ 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.*") diff --git a/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild b/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild index e0493b3b11ad..abaaea86894a 100644 --- a/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild +++ b/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild,v 1.3 2011/07/28 19:26:22 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild,v 1.4 2011/07/29 10:14:59 scarabeus Exp $ EAPI=4 @@ -28,6 +28,7 @@ PATCHES=( "${FILESDIR}/${PN}-includes-libs-perl.patch" "${FILESDIR}/${PN}-disablefonttest.patch" "${FILESDIR}/${PN}-multilib-strict.patch" + "${FILESDIR}/${PN}-fix-nostdlib.patch" ) pkg_setup() { @@ -37,11 +38,6 @@ pkg_setup() { src_prepare() { base_src_prepare - # fix CFLAGS - sed -i \ - -e 's:-nodefaultlibs -nostdlibs::' \ - src/CMakeLists.txt || die - # fix perl linking if use perl; then _check_build_dir init |