diff options
| author | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-02-14 23:03:07 +0100 |
|---|---|---|
| committer | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-02-14 23:03:07 +0100 |
| commit | 8bb0ae2265feb8dc2632dc23e1e3136476ff0179 (patch) | |
| tree | e27121b891afcac40b1d7983338d51b05683aa00 /eclass/kde4-meta.eclass | |
| parent | 8767f00978c0ea69db9e9dd495beadbfe9219144 (diff) | |
| download | kde-8bb0ae2265feb8dc2632dc23e1e3136476ff0179.tar.gz kde-8bb0ae2265feb8dc2632dc23e1e3136476ff0179.tar.bz2 kde-8bb0ae2265feb8dc2632dc23e1e3136476ff0179.zip | |
Revert "Reordered some invocations in eclass (unpack) - in order to break random packages :P"
Apparetnly it breaks KMCOMPILEONLY/KMEXTRACTONLY combination - kdebase-startkde to name one
This reverts commit f5968046f4439cf79bd0637afe9163174a8f7915.
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 3ca94f2b840..b4144740c16 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -473,17 +473,8 @@ kde4-meta_change_cmakelists() { _change_cmakelists_parent_dirs ${KMMODULE} fi - 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 + local i for i in ${KMCOMPILEONLY}; do debug-print "${LINENO}: KMCOMPILEONLY, processing ${i}" # Uncomment "add_subdirectory" instructions inside $KMCOMPILEONLY, then comment "install" instructions. @@ -505,7 +496,6 @@ kde4-meta_change_cmakelists() { die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}" _change_cmakelists_parent_dirs ${i} done - # KMEXTRA_NONFATAL section for i in ${KMEXTRA_NONFATAL}; do if [[ -d "${S}"/${i} ]]; then @@ -516,6 +506,14 @@ 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 |