diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-03 14:48:54 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-03 14:48:54 +0100 |
| commit | e8cbbdc84d4eedce016ca7d0789c1cc6aa8e8820 (patch) | |
| tree | 4bbfe53fba609460b9a145fe9f4e4b6208997f6e /eclass/kde4-meta.eclass | |
| parent | 8017bbc5c3eaf1391e3201bce4ab08a8b0317782 (diff) | |
| download | kde-e8cbbdc84d4eedce016ca7d0789c1cc6aa8e8820.tar.gz kde-e8cbbdc84d4eedce016ca7d0789c1cc6aa8e8820.tar.bz2 kde-e8cbbdc84d4eedce016ca7d0789c1cc6aa8e8820.zip | |
Reorganize km* stuff so it extract and comment correctly.
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 49930c43d3f..649cc3c9dc2 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -427,7 +427,6 @@ kde4-meta_src_prepare() { kde4-base_src_prepare } - # FIXME: no comment here? _change_cmakelists_parent_dirs() { debug-print-function ${FUNCNAME} "$@" @@ -470,8 +469,17 @@ kde4-meta_change_cmakelists() { _change_cmakelists_parent_dirs ${KMMODULE} fi - # KMCOMPILEONLY local i + + # KMEXTRACTONLY section - Some ebuilds need to comment out some subdirs in KMMODULE and they use KMEXTRACTONLY + for i in ${KMEXTRACTONLY}; do + if [[ -d "${S}"/${i} && -f "${S}"/${i}/../CMakeLists.txt ]]; then + sed -i -e "/([[:space:]]*$(basename $i)[[:space:]]*)/s/^/#DONOTCOMPILE /" "${S}"/${i}/../CMakeLists.txt || \ + die "${LINENO}: sed died while working in the KMEXTRACTONLY section while processing ${i}" + fi + done + + # KMCOMPILEONLY for i in ${KMCOMPILEONLY}; do debug-print "${LINENO}: KMCOMPILEONLY, processing ${i}" # Uncomment "add_subdirectory" instructions inside $KMCOMPILEONLY, then comment "install" instructions. @@ -503,14 +511,6 @@ kde4-meta_change_cmakelists() { fi done - # KMEXTRACTONLY section - Some ebuilds need to comment out some subdirs in KMMODULE and they use KMEXTRACTONLY - for i in ${KMEXTRACTONLY}; do - if [[ -d "${S}"/${i} && -f "${S}"/${i}/../CMakeLists.txt ]]; then - sed -i -e "/([[:space:]]*$(basename $i)[[:space:]]*)/s/^/#DONOTCOMPILE /" "${S}"/${i}/../CMakeLists.txt || \ - die "${LINENO}: sed died while working in the KMEXTRACTONLY section while processing ${i}" - fi - done - case ${KMNAME} in kdebase-workspace) # COLLISION PROTECT section |
