mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
kde-base/kdelibs: Fix build w/ GCC-6.2
Gentoo-bug: 582480 Package-Manager: portage-2.3.0
This commit is contained in:
committed by
Michael Palimaka
parent
0447805aae
commit
70e630f611
51
kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch
Normal file
51
kde-base/kdelibs/files/kdelibs-4.14.25-gcc62.patch
Normal file
@@ -0,0 +1,51 @@
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Wed, 19 Oct 2016 12:44:03 +0000
|
||||
Subject: Fix HAVE_TRUNC cmake check
|
||||
X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=0c642ae95dacf894e50630ffcc1961ad1e4e0322
|
||||
---
|
||||
Fix HAVE_TRUNC cmake check
|
||||
|
||||
On newer distros the check fails because trunc is ambiguous, so tell sizeof exactly which trunc we're speaking about.
|
||||
|
||||
REVIEW: 129119
|
||||
---
|
||||
|
||||
|
||||
--- a/ConfigureChecks.cmake
|
||||
+++ b/ConfigureChecks.cmake
|
||||
@@ -244,7 +244,7 @@
|
||||
check_prototype_exists(usleep unistd.h HAVE_USLEEP_PROTO)
|
||||
check_prototype_exists(initgroups "unistd.h;sys/types.h;unistd.h;grp.h" HAVE_INITGROUPS_PROTO)
|
||||
check_prototype_exists(setreuid unistd.h HAVE_SETREUID_PROTO)
|
||||
-check_prototype_exists(trunc math.h HAVE_TRUNC)
|
||||
+check_prototype_exists(trunc math.h HAVE_TRUNC "(double (*)(double))")
|
||||
|
||||
# check for existing datatypes
|
||||
|
||||
|
||||
--- a/cmake/modules/CheckPrototypeExists.cmake
|
||||
+++ b/cmake/modules/CheckPrototypeExists.cmake
|
||||
@@ -21,6 +21,13 @@
|
||||
INCLUDE(CheckCXXSourceCompiles)
|
||||
|
||||
MACRO (CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT)
|
||||
+ SET(extra_macro_args ${ARGN})
|
||||
+ LIST(LENGTH extra_macro_args num_extra_args)
|
||||
+ SET(_PROTOTYPE "")
|
||||
+ IF (${num_extra_args} EQUAL 1)
|
||||
+ LIST(GET extra_macro_args 0 _PROTOTYPE)
|
||||
+ ENDIF ()
|
||||
+
|
||||
SET(_INCLUDE_FILES)
|
||||
FOREACH (it ${_HEADER})
|
||||
SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
|
||||
@@ -31,7 +38,7 @@
|
||||
int main()
|
||||
{
|
||||
#ifndef ${_SYMBOL}
|
||||
- int i = sizeof(&${_SYMBOL});
|
||||
+ int i = sizeof(${_PROTOTYPE}&${_SYMBOL});
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -132,6 +132,7 @@ PATCHES=(
|
||||
"${FILESDIR}/${PN}-4.10.0-udisks.patch"
|
||||
"${FILESDIR}/${PN}-4.14.20-FindQt4.patch"
|
||||
"${FILESDIR}/${PN}-4.14.22-webkit.patch"
|
||||
"${FILESDIR}/${PN}-4.14.25-gcc62.patch"
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
|
||||
Reference in New Issue
Block a user