From dd4f8694a46c9a7aea22a0de1264910e7a9dd6bb Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 29 Jul 2011 10:14:59 +0000 Subject: [PATCH] Fix nostdlibs typo correctly everywhere, fixes part of the bug #376799. Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- media-gfx/graphite2/ChangeLog | 6 +++- media-gfx/graphite2/Manifest | 11 +++---- .../files/graphite2-fix-nostdlib.patch | 29 +++++++++++++++++++ media-gfx/graphite2/graphite2-0.9.4-r1.ebuild | 8 ++--- 4 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 media-gfx/graphite2/files/graphite2-fix-nostdlib.patch 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 + +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 graphite2-0.9.4-r1.ebuild: diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest index 48a58f88e8df..d725dcc7f651 100644 --- a/media-gfx/graphite2/Manifest +++ b/media-gfx/graphite2/Manifest @@ -2,16 +2,17 @@ Hash: SHA1 AUX graphite2-disablefonttest.patch 3239 RMD160 05de65868555648df40abd219f18855d24440ffe SHA1 4ae5238eaf376ac362e0e70c6f5ba5eded404b3f SHA256 4f216133001c45c0748f870fdfb2afce03be3369409ff63717edecec7b5f2e9d +AUX graphite2-fix-nostdlib.patch 1712 RMD160 640485f64d16c199cc73e0be6d3fa96c8d74027f SHA1 3a6af85969dca25a6202fe6f3b3443a45e83729e SHA256 2b8844ccba51943d541acfd68c0bdb7f5836b470e775b4d92efbb59d362e1ef7 AUX graphite2-includes-libs-perl.patch 536 RMD160 ae964c2aacd8a8d6383b25c1f045fe4771558b09 SHA1 9209a91a11f3e9feb6fd3a449b85d8d1b185788f SHA256 84a1bff6793b9fd49268b9e5927ac249e960d34cac119fe17b8cf35032c9f11b AUX graphite2-multilib-strict.patch 1190 RMD160 09079fa143c030621ea2d013baa2491335c780ac SHA1 1f40393332628e3feaa473a238e5fc762f437d14 SHA256 c6a7eb3b6f500ef27808cb90287b4e183ac4acf13a47832da7d484bebca8a2a4 DIST graphite2-0.9.4.tgz 3548861 RMD160 6181dd3ecc9741f36255cc431a630243fc7c90cb SHA1 bf7c359c5338b8e0ea54a72985c6c9adb16f6fb8 SHA256 75ea41360ddf0d84364a790c0494708a4e14643915ad517309d330ceb34b60ee -EBUILD graphite2-0.9.4-r1.ebuild 1659 RMD160 d4c46b7971c69c027fb9ccc259cabe534e702a4a SHA1 1c3d43c0594ebba34bdf8b1b21d10acb772d01dc SHA256 d01298e9e1c94b4472763b9822335a1bf3b8a6c425b537276c15440f7b16cbec -MISC ChangeLog 1290 RMD160 1a3138a6c49b9294ae311563743002ef9a38214a SHA1 2b103123da35c51bd4cc01ee28b1c8431b0f4b02 SHA256 97c963b1fc2390a9b8374f7a9c4740751ba03339d3cacb12da2b40673fc77a1e +EBUILD graphite2-0.9.4-r1.ebuild 1607 RMD160 cb5268699ff93ebe0712bca98d2846b364898ea0 SHA1 9cbefa9095e41231159e09d4e2537ccae7f1021f SHA256 10f731f200e4ef7bb83bde5fd1ec4217b40f8e796101613191a8851d04c4c9a2 +MISC ChangeLog 1486 RMD160 f75da39fcb6476d584f7ddfe297a662c3480b4d7 SHA1 4247cc0092d02fa64e3c8794fc00a297d4e4b8d8 SHA256 ef77cbfbe83236ee53293056c5c9a7a8cbce0d7b33f9dad1649e116d6de61488 MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4xt4QACgkQHB6c3gNBRYe1PgCdEF+LnAiBHHHu/HYmROuGdmUK -+4cAoMIcXg7IN9hQWJKY0K5Tm3Jyzbcd -=EnWm +iEYEARECAAYFAk4yiCcACgkQHB6c3gNBRYdGOQCgy8t1dKDIioxNkv8nLGLfbgs3 +N0MAn3uLifEuorwZkyPiCyLMQTFHb8ZS +=hvmk -----END PGP SIGNATURE----- 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++ $) +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 -- 2.26.2