summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-04-11 21:59:37 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-04-11 21:59:37 +0000
commitf73abb008834428fd4183d5ed2cdb1072ad06427 (patch)
tree9dd2548f2628d2957266540d91d607cd4a035644 /kde-base
parentFix deprecation warning. (diff)
downloadgentoo-2-f73abb008834428fd4183d5ed2cdb1072ad06427.tar.gz
gentoo-2-f73abb008834428fd4183d5ed2cdb1072ad06427.tar.bz2
gentoo-2-f73abb008834428fd4183d5ed2cdb1072ad06427.zip
Disable fatal linker warnings for all kde apps on arm only to make things build, bug 336209
(Portage version: 2.1.9.45/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelibs/ChangeLog7
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch14
-rw-r--r--kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild3
3 files changed, 22 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 7145b61f385f..7f187b0fe5b0 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kdelibs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.742 2011/04/11 04:05:32 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.743 2011/04/11 21:59:37 dilfridge Exp $
+
+ 11 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ kdelibs-4.6.2-r2.ebuild, +files/kdelibs-4.6.2-armlinking.patch:
+ Disable fatal linker warnings for all kde apps on arm only to make things
+ build, bug 336209
11 Apr 2011; Joseph Jezak <josejx@gentoo.org> kdelibs-4.4.5-r4.ebuild:
Marked ppc stable for bug #361015.
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch b/kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch
new file mode 100644
index 000000000000..a207d1088348
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch
@@ -0,0 +1,14 @@
+diff -ruN kdelibs-4.6.2.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.6.2/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.6.2.orig/cmake/modules/FindKDE4Internal.cmake 2011-04-01 15:56:18.000000000 +0200
++++ kdelibs-4.6.2/cmake/modules/FindKDE4Internal.cmake 2011-04-11 23:53:19.067196607 +0200
+@@ -1092,8 +1092,8 @@
+ if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
+- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
++ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
+
+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}")
+ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}")
diff --git a/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild b/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild
index 608ec8728cd5..a05770aa48ad 100644
--- a/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.2-r2.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/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild,v 1.1 2011/04/10 19:43:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild,v 1.2 2011/04/11 21:59:37 dilfridge Exp $
EAPI=3
@@ -142,6 +142,7 @@ PATCHES=(
src_prepare() {
kde4-base_src_prepare
+ use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work)
local menu_prefix="kde-${SLOT}-"