projects
/
gentoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6798179
)
kde5.eclass: merge type is already checked in _check_gcc_version
author
Michael Palimaka
<kensington@gentoo.org>
Fri, 15 Apr 2016 19:15:21 +0000
(
05:15
+1000)
committer
Michael Palimaka
<kensington@gentoo.org>
Wed, 20 Apr 2016 17:15:33 +0000
(
03:15
+1000)
eclass/kde5.eclass
patch
|
blob
|
history
diff --git
a/eclass/kde5.eclass
b/eclass/kde5.eclass
index 313e0609d175d3ca45f50d0751bb2b6537a9d83d..fce7d129102a2bb8d559186ef6005c9e93363315 100644
(file)
--- a/
eclass/kde5.eclass
+++ b/
eclass/kde5.eclass
@@
-337,9
+337,7
@@
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
# Do some basic settings
kde5_pkg_pretend() {
debug-print-function ${FUNCNAME} "$@"
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_gcc_version
- fi
+ _check_gcc_version
}
# @FUNCTION: kde5_pkg_setup
@@
-347,9
+345,7
@@
kde5_pkg_pretend() {
# Do some basic settings
kde5_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_gcc_version
- fi
+ _check_gcc_version
}
# @FUNCTION: kde5_src_unpack