mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-30 17:33:03 +02:00
cmake: update to 3.22.1.
This commit is contained in:
parent
1f75bfe7fa
commit
9891085a06
2 changed files with 2 additions and 22 deletions
|
@ -1,20 +0,0 @@
|
||||||
Fix darktable build
|
|
||||||
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
|
|
||||||
index 5a4c6521d8..55b804d643 100644
|
|
||||||
--- a/Source/cmNinjaNormalTargetGenerator.cxx
|
|
||||||
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
|
|
||||||
@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
|
|
||||||
this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
|
|
||||||
config);
|
|
||||||
if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
|
|
||||||
- vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
|
|
||||||
+ switch (targetType) {
|
|
||||||
+ case cmStateEnums::EXECUTABLE:
|
|
||||||
+ case cmStateEnums::SHARED_LIBRARY:
|
|
||||||
+ case cmStateEnums::MODULE_LIBRARY:
|
|
||||||
+ vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'cmake'
|
# Template file for 'cmake'
|
||||||
pkgname=cmake
|
pkgname=cmake
|
||||||
version=3.21.1
|
version=3.22.1
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
|
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
|
||||||
|
@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
|
||||||
license="BSD-3-Clause, ICU"
|
license="BSD-3-Clause, ICU"
|
||||||
homepage="https://www.cmake.org"
|
homepage="https://www.cmake.org"
|
||||||
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
|
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
|
||||||
checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
|
checksum=0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0
|
||||||
replaces="cmake-bootstrap>=0"
|
replaces="cmake-bootstrap>=0"
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
|
|
Loading…
Add table
Reference in a new issue