Differential D13102

Don't include a 64 when building 64bit architectures on flatpak
ClosedPublic
Actions

Authored by apol on May 25 2018, 1:09 AM.

Details

Reviewers
krop
Group Reviewers
Frameworks
Commits
R240:5cf0be9327c3: Don't include a 64 when building 64bit architectures on flatpak
Summary

It's not a thing on flatpak and it makes packaging weird.
Should fix https://github.com/flatpak/freedesktop-sdk-base/issues/22

Diff Detail

Repository
R240 Extra CMake Modules
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
apol created this revision.May 25 2018, 1:09 AM
Restricted Application added projects: Frameworks, Build System. · View Herald TranscriptMay 25 2018, 1:09 AM
Restricted Application added subscribers: kde-buildsystem, kde-frameworks-devel. · View Herald Transcript
apol requested review of this revision.May 25 2018, 1:09 AM
apol added a subscriber: eszlari.May 25 2018, 1:10 AM
krop added a subscriber: krop.May 25 2018, 6:28 AM

Please update the doc above.

apol added a comment.May 25 2018, 11:26 AM
In D13102#268015, @cgiboudeaux wrote:

Please update the doc above.

the documentation right now is:

# ``LIBDIR``
#     object code libraries (``EXECROOTDIR/lib``, ``EXECROOTDIR/lib64`` or
#     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian) [``LIB_INSTALL_DIR``]

I don't really see how to put it without reading convoluted. Also as is, the documentation isn't wrong, we are just changing the logic to use one or another.

eszlari added a comment.EditedMay 30 2018, 12:02 PM
In D13102#268116, @apol wrote:

I don't really see how to put it without reading convoluted. Also as is, the documentation isn't wrong, we are just changing the logic to use one or another.

Maybe he just wants you to add another item to the list above, e.g.:

# - we are not inside the flatpak sandbox
apol updated this revision to Diff 35185.May 30 2018, 1:46 PM

Mention on the documentation that we don't change the lib/ value on flatpak

krop added a comment.May 30 2018, 2:12 PM

Thanks. +1

apol added a comment.Jun 5 2018, 1:31 PM

Ping?

@cgiboudeaux maybe you can accept the patch?

krop accepted this revision.Jun 5 2018, 1:49 PM
This revision is now accepted and ready to land.Jun 5 2018, 1:49 PM
Closed by commit R240:5cf0be9327c3: Don't include a 64 when building 64bit architectures on flatpak (authored by apol). · Explain WhyJun 5 2018, 3:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mkde-modules/KDEInstallDirs.cmake (4 lines)

Diff 35626

View Options

kde-modules/KDEInstallDirs.cmake

Loading...