diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-01 15:40:24 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-01 15:40:24 +0200 |
| commit | 60b48314421418f7f1bd2d04b51aa578027db246 (patch) | |
| tree | 0311c9081ce14b301260eb0c68e02602e1483eda /eclass | |
| parent | 4492695b6221b6373ff1485a3d89afa716360b89 (diff) | |
| download | kde-60b48314421418f7f1bd2d04b51aa578027db246.tar.gz kde-60b48314421418f7f1bd2d04b51aa578027db246.tar.bz2 kde-60b48314421418f7f1bd2d04b51aa578027db246.zip | |
[eclasses/kdelibs] Rework the gcc checker to be little less resources consuming.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 8 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 22 |
2 files changed, 9 insertions, 21 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 8fe4a0bf5d4..a1700d93fab 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -642,6 +642,14 @@ kde4-base_pkg_setup() { # Don't set KDEHOME during compilation, it will cause access violations unset KDEHOME + # Check if gcc compiler is fresh enough. + # In theory should be in pkg_pretend but we check it only for kdelibs there + # and for others we do just quick scan in pkg_setup because pkg_pretend + # executions consume quite some time. + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)." + if [[ ${KDEBASE} = kde-base ]]; then if use kdeprefix; then KDEDIR=/usr/kde/${SLOT} diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index d59e4fdaae1..6dcd13d6ca0 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -16,14 +16,7 @@ inherit kde4-base toolchain-funcs versionator -case ${EAPI:-0} in - 3) - KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm" - ;; - *) - KDEMETA_EXPF="pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm" - ;; -esac +KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm" EXPORT_FUNCTIONS ${KDEMETA_EXPF} # Add dependencies that all packages in a certain module share. @@ -137,17 +130,6 @@ fi # Specify extra parameters to pass to tar, in kde4-meta_src_extract. # '-xpf -j' are passed to tar by default. -# @FUNCTION: kde4-meta_pkg_pretend -# @DESCRIPTION: -# Currently only checks the gcc version. -kde4-meta_pkg_pretend() { - debug-print-function ${FUNCNAME} "$@" - - slot_is_at_least 4.6 ${SLOT} && ( [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) ) \ - && die "Sorry, but gcc-4.3 and earlier wont work for KDE SC 4.6 (see bug 354837)." -} - # @FUNCTION: kde4-meta_pkg_setup # @DESCRIPTION: # Currently calls its equivalent in kde4-base.eclass(5) and checks the gcc version. @@ -155,8 +137,6 @@ kde4-meta_pkg_pretend() { kde4-meta_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - has pkg_pretend ${KDEMETA_EXPF} || kde4-meta_pkg_pretend - kde4-base_pkg_setup } |