Changeset 9434e9a


Ignore:
Timestamp:
08/26/2019 01:28:27 PM (2 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 9.0, 9.1, lazarus, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
f6da3b9
Parents:
425f8d69
Message:

Tweak Extra-cmake-modules instead of plasma-workspace, since any other kf5
package could be pottentially affected by ECM in /usr. Tested by rebuilding
all the packages dependent on ECM, and starting KDe Plasma successfully.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22056 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
kde
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kde/extra-cmake-modules.xml

    r425f8d69 r9434e9a  
    8181    <bridgehead renderas="sect4">Optional</bridgehead>
    8282    <para role="optional">
    83       <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink> (for building documentation)
     83      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink> (for
     84         building documentation)
    8485    </para>
    8586
     
    9394
    9495    <para>
    95       Install <application>Extra Cmake Modules</application> by running the following
    96       commands:
     96      Install <application>Extra Cmake Modules</application> by running the
     97      following commands:
    9798    </para>
    9899
    99100<screen><userinput>sed -i '/"lib64"/s/64//' kde-modules/KDEInstallDirs.cmake &amp;&amp;
     101
     102sed -e '/PACKAGE_INIT/i set(SAVE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}")' \
     103    -e '/^include/a set(PACKAGE_PREFIX_DIR "${SAVE_PACKAGE_PREFIX_DIR}")' \
     104    -i ECMConfig.cmake.in &amp;&amp;
    100105
    101106mkdir build &amp;&amp;
     
    131136      sub-directory.
    132137    </para>
     138
     139    <para>
     140    <command>sed ... ECMConfig.cmake.in</command>:
     141      This command protects the global <application>cmake</application>
     142      variable <envar>PACKAGE_PREFIX_DIR</envar> from being changed when
     143      checking ECM presence: since we install ECM into <filename
     144      class="directory">/usr</filename>, the check would set that variable to
     145      <filename class="directory">/usr</filename>, while most KDE packages
     146      expect it to be set to <filename class="directory">/opt/kf5</filename>
     147      and would fail to build if it is set to something else.
     148    </para>
    133149  </sect2>
    134150
  • kde/kf5/kf5-frameworks.xml

    r425f8d69 r9434e9a  
    319319    pushd $packagedir
    320320   
    321       # Fix a cmake problem in plasma-framework
    322       if [ "$name" == "plasma-framework" ]; then
    323         sed -e '/CMakeFind/i set(SAVE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}")' \
    324             -e '/find_dep/a set(PACKAGE_PREFIX_DIR "${SAVE_PACKAGE_PREFIX_DIR}")'  \
    325             -i src/plasmaquick/KF5PlasmaQuickConfig.cmake.in
    326       fi
    327 
    328321      mkdir build
    329322      cd    build
Note: See TracChangeset for help on using the changeset viewer.