feat/trinity-cmake #212
Merged
SlavekB
merged 2 commits from feat/trinity-cmake into master 3 years ago
SlavekB
Loading…
Reference in new issue
There is no content yet.
Delete Branch 'feat/trinity-cmake'
Deleting a branch is permanent. It CANNOT be undone. Continue?
Since the cmake module has been removed in new packages in favor of installing the
trinity-cmakepackage, I suggest enabling the following changes.This package is expected to be needed in version 14.0.11 as well as in the live version. At the moment, it is impossible to compile a live version of TDE without these changes.
It's a good step forward, but there is a need for adjustment.
[[ ${PN} != tdelibs ]] && [[ ${TRINITY_MODULE_TYPE} != "dependencies" ]] &&COMMON_DEPEND+=" ~trinity-base/tdelibs-${PV}"[[ ${PN} == "14.0.1"[1-9] ]] || [[ "${BUILD_TYPE}" == "live" ]] &&[[ ${TRINITY_MODULE_TYPE} != "dependencies" ]] &&You can notice that Trinity macros for CMake are also used in modules with the type
dependencies. Therefore, I believe that this needs to be adjusted.Yes, quite right, I corrected it. Replaced with this line:
so that there are no cyclic dependencies.
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"><pkgmetadata><!-- maintainer-needed -->BTW, for some time here is a mailing list tde-team-gentoo – email address
team-gentoo@trinitydesktop.org. This could be used for metadata. You can consider signing in to this ML.Fixed.
33801c6f63toddf73334883 years agoMade changes, everything is working.
It looks good.
ddf7333488into master 3 years agoReviewers
ddf7333488.