Cmake #295
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| inherit: [cmake] | ||
|
|
||
| depends: | ||
| - name: devel::cmake-3 | ||
| use: [tools] | ||
| tools: | ||
| target-toolchain: host-compat-toolchain |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| inherit: [patch] | ||
|
|
||
| metaEnvironment: | ||
| PKG_VERSION: "3.31.0" | ||
| PKG_LICENSE: "BSD-3-Clause" | ||
|
|
||
| checkoutSCM: | ||
| scm: url | ||
| url: ${GITHUB_MIRROR}/Kitware/CMake/releases/download/v${PKG_VERSION}/cmake-${PKG_VERSION}.tar.gz | ||
| digestSHA256: "300b71db6d69dcc1ab7c5aae61cbc1aa2778a3e00cbd918bc720203e311468c3" | ||
| stripComponents: 1 | ||
|
|
||
| checkoutDeterministic: True | ||
| checkoutScript: | | ||
| patchApplySeries $<@cmake/*.patch@> | ||
|
Member
There was a problem hiding this comment. This is certainly not working, or? Even if it does currently, it will fail in the future. We have to keep the cmake-3 patches separate... |
||
|
|
||
| multiPackage: | ||
| "": | ||
| inherit: [cmake] | ||
| depends: | ||
| - libs::expat-dev | ||
| - libs::jsoncpp-dev | ||
| - libs::libarchive-dev | ||
| - libs::libuv-dev | ||
| - libs::rhash-dev | ||
| - libs::zlib-dev | ||
| - net::curl-dev | ||
| - use: [] | ||
| depends: | ||
| - libs::expat-tgt | ||
| - libs::jsoncpp-tgt | ||
| - libs::libarchive-tgt | ||
| - libs::libuv-tgt | ||
| - libs::rhash-tgt | ||
| - libs::zlib-tgt | ||
| - net::curl-tgt | ||
|
|
||
| buildScript: | | ||
| cmakeBuild "$1" \ | ||
| -DKWSYS_LFS_WORKS=TRUE \ | ||
| -DKWSYS_CHAR_IS_SIGNED=TRUE \ | ||
| -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ | ||
| -DCTEST_USE_XMLRPC=OFF \ | ||
| -DBUILD_CursesDialog=OFF | ||
|
|
||
| packageScript: | | ||
| cmakePackageTgt | ||
|
|
||
| provideDeps: [ "*-tgt" ] | ||
|
|
||
| bootstrap: | ||
|
Member
There was a problem hiding this comment. AFAICT, the bootstrap package can be removed, couldn't it? |
||
| inherit: [make, install] | ||
|
|
||
| buildTools: [target-toolchain] | ||
| buildVars: [CC, CXX, LD, CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS] | ||
| buildVarsWeak: [MAKE_JOBS] # hook onto make class | ||
| buildScript: | | ||
| mkdir -p build install | ||
| pushd build | ||
| "$1"/bootstrap \ | ||
| --prefix=/usr \ | ||
| --parallel="${MAKE_JOBS-$(nproc)}" -- \ | ||
| -DCMAKE_USE_OPENSSL:BOOL=OFF \ | ||
| -DBUILD_CursesDialog=OFF | ||
| makeParallel | ||
| make install DESTDIR="$PWD/../install" | ||
| popd | ||
|
|
||
| packageScript: | | ||
| installPackageTgt "$1/install/" | ||
|
|
||
| provideTools: | ||
| cmake: usr/bin | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm afraid that doesn't work this way. After merging #282, the
ninjaandmakeclasses set different values for thejobServerkey. 😕The only way forward that I see is to move the common parts of this class to classes/basement/bits/cmake.yaml and create a new class
cmake-makethat doesinherit: ["basement::bits::cmake", make].There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😢 Bad timing... I have not rebased to #282...
I need this for only one package. I'll move
make-inherit to the recipe and leave only theCMAKE_GENERATORchange here..There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems fragile. I just had another idea. We could set
jobServer: "fifo"explicitly in the cmake class again with a big, fat comment explaining why. This mode is compatible with both tools...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If make understands fifo as well why do we not simply set
jobServer: "fifo"in the make-class?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It will fail if you start Bob from an old make. See here. OTOH, as soon as you hit a cmake/ninja recipe, this will happen anyway. Looking back, it should probably be a warning and just not pass the incompatible job server instead of failing.
Having said that, it sounds like an artificial problem. So using "fifo" consistently looks like the best way forward. Let's do it this way...