mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-16 18:01:09 +02:00
dev-build/cmake: Sync with Gentoo
It's from Gentoo commit 15b8276e3b228f6d1dc7f8786e06c6ed1308efb4. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
a3372d2a7c
commit
fd71f4dcd2
@ -16,6 +16,9 @@ DIST cmake-4.0.0_rc1-docs.tar.xz 577536 BLAKE2B 74a742ffef8e1af1652746e1c177d419
|
||||
DIST cmake-4.0.3-SHA-256.txt 2015 BLAKE2B a346da6aa064c5b390459ab265680e0835f4a66fae6c957cedce302da13daa31e8387b1113b049d5518a2b0431d6ee9ad8fd10abec9e6b35502f954cc02a15ee SHA512 f1ce0d1d9ca3286d311611de2da19de543105dfedda5f0449648a79d0c4ecb2a221aad540915bdc3f1904966c79c60b828cb8a7e6198a718f6f6906bd07697eb
|
||||
DIST cmake-4.0.3-SHA-256.txt.asc 833 BLAKE2B 0e82305e93eedfe888e2c54590e509aad58f5d634d3112c66ff5eff622619aef53e4d97f67921b5998082117430d541220df6e2e58656749ae8620aad4928a8a SHA512 d502d87bbf5bb24bdd2d6a0a1d97b854dcc09e17b00e6fa9af4610eb5984b46fd2d7a2a01c15e89bbeed25882738fa764d4b7746c4e25c197d9017277c6f95b8
|
||||
DIST cmake-4.0.3.tar.gz 11830216 BLAKE2B 4dc2705baf2404b64da88a5b8838850b782849a4dcdfb0eaefa819ba00a018885a8bd0b42f17f92c8e24b9e76c66e60880377017d8e2d584cb75b2978018e214 SHA512 d3fb9ef408a1b13cd6ef1c294b2515733d1c7220c2c639426bd8037d023ebb439f02e412dd8dd42e385b8e3553547d785eeedc47f2b0843e413b88bd5a7eab18
|
||||
DIST cmake-4.0.4-SHA-256.txt 2015 BLAKE2B 4e7c7e2ef9d4fff4cda2b85f266cc7b1de2dfd0ada2c44ae20d8efc877c9e6ab9bd9a3ae877b103572bad93cbf10b3dcec28c5ba90c712e65aa77469c1e1c40c SHA512 84554190345bfccaa53f97c8c5d852178ed1351ddec61f77c05259a1a5e94d61d87c09398a46e095731fa9c859fa94485d7243cf30ade148adabcf00f0ec6ed8
|
||||
DIST cmake-4.0.4-SHA-256.txt.asc 833 BLAKE2B 890b0f05b5fe949110c6a4343c1d307960127e85a1c8b81ecb6a8fc8bf8f82d34f21d9b5967b661ddf53f173641188a245c12b6a3723d17790c23a8abcb0ac0c SHA512 ca9acb330168d6a027fe6243d2ddbf4256ce084b11a17fd54def3610e065cb8318b97ab1fddf37c087ce87e9edd58a1ec7720fb477e63d681d9f7ee82ac7143b
|
||||
DIST cmake-4.0.4.tar.gz 11830071 BLAKE2B 9ecf401fca4a16944d4499daff6995baa1c37fdac4d75bc3c4f228585612b58786ccff5273c72dae801427897b1da05f71b4ae58835f939c4bc533b4cefed5c5 SHA512 d40959be0c685e7e579557feb0c7682a19139a7d50b7d94f01b4d8d2ce083c1a806891e9f7e10b5bdde436e43a7bed91bea8318214dd6a14237b689bfe5d0041
|
||||
DIST cmake-4.1.0-SHA-256.txt 2015 BLAKE2B cbbe940911a0bfb18a0fb0dcc714ad750f348c1a7f7e176816cc6d9e32e0ae4b3f0c1ace3779e17cb443f2cce2b41bf53d756a20b665a3bdcb95d4acd0b6638f SHA512 e81e07abae94588a5ed9cb62396dba04885ed8ddda98751c991af970509e07e6899896d998b52c04c67e58e81e1af243fc64bf7a127e37027385539c5cf6a050
|
||||
DIST cmake-4.1.0-SHA-256.txt.asc 833 BLAKE2B 28b6415e1e60f81cf3295573ad43e732fbd53b8d8c76b589a56ea9a8abb02bc7de1d0875fe55ffde8588368a1555f8010769b6ffa92ef860a085b15d0b7f5917 SHA512 beb141dbb66c302a6aff1667afa56898f266e9f8d630e75b806bc2e59178ba56f5a84022b5c9d2e24fb8e762168644ba49fe059812750132c2b11b5821ee456a
|
||||
DIST cmake-4.1.0.tar.gz 12042798 BLAKE2B 57e086b18f24d97e386a391151b09fe228feb22fbf0af31f26859069cf269de32b763d1545cdd18f5f73ede1980a83cb21a2b9a8a04a5aa0b08f2525def4c134 SHA512 644b6b13539ba0e7f35a7496e4240b1d3361606163f35b69006e47d03ffd9759d35c62a73826253ed168af4196df29983ec10c0f561ea74d7ed6ffee0c2cd8e4
|
||||
|
||||
@ -98,6 +98,7 @@ PATCHES=(
|
||||
|
||||
# Upstream fixes (can usually be removed with a version bump)
|
||||
"${FILESDIR}"/${PN}-3.31.6-curl-8.13.0.patch
|
||||
"${FILESDIR}"/${PN}-3.28.5-curl-8.16.0.patch
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
|
||||
@ -98,6 +98,8 @@ PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
|
||||
|
||||
# Upstream fixes (can usually be removed with a version bump)
|
||||
"${FILESDIR}"/${PN}-3.31.6-curl-8.13.0.patch
|
||||
"${FILESDIR}/${PN}-4.1.1-curl-8.16.0.patch"
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
|
||||
@ -99,6 +99,7 @@ PATCHES=(
|
||||
|
||||
# Upstream fixes (can usually be removed with a version bump)
|
||||
"${FILESDIR}"/${PN}-3.31.7-hdf5.patch
|
||||
"${FILESDIR}/${PN}-4.1.1-curl-8.16.0.patch"
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
|
||||
@ -99,6 +99,7 @@ PATCHES=(
|
||||
|
||||
# Upstream fixes (can usually be removed with a version bump)
|
||||
"${FILESDIR}"/${PN}-3.31.7-hdf5.patch
|
||||
"${FILESDIR}/${PN}-4.1.1-curl-8.16.0.patch"
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
|
||||
@ -103,6 +103,7 @@ PATCHES=(
|
||||
|
||||
# Upstream fixes (can usually be removed with a version bump)
|
||||
"${FILESDIR}"/${PN}-3.31.7-hdf5.patch
|
||||
"${FILESDIR}/${PN}-4.1.1-curl-8.16.0.patch"
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
|
||||
322
sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-4.0.4.ebuild
vendored
Normal file
322
sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-4.0.4.ebuild
vendored
Normal file
@ -0,0 +1,322 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
|
||||
# Set to 1 if prebuilt, 0 if not
|
||||
# (the construct below is to allow overriding from env for script)
|
||||
: ${CMAKE_DOCS_PREBUILT:=1}
|
||||
|
||||
CMAKE_DOCS_PREBUILT_DEV=sam
|
||||
CMAKE_DOCS_VERSION=4.0.0_rc1
|
||||
#CMAKE_DOCS_VERSION=${PV}
|
||||
#CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
|
||||
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
|
||||
# See bug #784815
|
||||
CMAKE_DOCS_USEFLAG="+doc"
|
||||
|
||||
# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
|
||||
# ... but seems fine as of 3.22.3?
|
||||
# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
|
||||
CMAKE_MAKEFILE_GENERATOR="emake"
|
||||
CMAKE_REMOVE_MODULES_LIST=( none )
|
||||
inherit bash-completion-r1 cmake flag-o-matic multiprocessing \
|
||||
toolchain-funcs xdg-utils
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
|
||||
DESCRIPTION="Cross platform Make"
|
||||
HOMEPAGE="https://cmake.org/"
|
||||
if [[ ${PV} == *9999* ]] ; then
|
||||
CMAKE_DOCS_PREBUILT=0
|
||||
|
||||
EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
|
||||
|
||||
if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
|
||||
SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
|
||||
fi
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI+=" verify-sig? (
|
||||
https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt
|
||||
https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt.asc
|
||||
https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt
|
||||
https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt.asc
|
||||
)"
|
||||
|
||||
if [[ ${PV} != *_rc* ]] ; then
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
|
||||
fi
|
||||
|
||||
[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=app-arch/libarchive-3.3.3:=
|
||||
app-crypt/rhash:0=
|
||||
>=dev-libs/expat-2.0.1
|
||||
>=dev-libs/jsoncpp-1.9.2-r2:0=
|
||||
>=dev-libs/libuv-1.10.0:=
|
||||
>=net-misc/curl-7.21.5[ssl]
|
||||
sys-libs/zlib
|
||||
virtual/pkgconfig
|
||||
dap? ( dev-cpp/cppdap )
|
||||
gui? ( dev-qt/qtbase:6[gui,widgets] )
|
||||
ncurses? ( sys-libs/ncurses:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND+="
|
||||
doc? (
|
||||
dev-python/requests
|
||||
dev-python/sphinx
|
||||
)
|
||||
test? ( app-arch/libarchive[zstd] )
|
||||
"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
PATCHES=(
|
||||
# Prefix
|
||||
"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
|
||||
"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
|
||||
# Misc
|
||||
"${FILESDIR}"/${PN}-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch
|
||||
"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
|
||||
"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
|
||||
# Cuda
|
||||
"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
|
||||
|
||||
# Upstream fixes (can usually be removed with a version bump)
|
||||
"${FILESDIR}"/${PN}-3.31.7-hdf5.patch
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
# disable running of cmake in bootstrap command
|
||||
sed -i \
|
||||
-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
|
||||
bootstrap || die "sed failed"
|
||||
|
||||
# execinfo.h on Solaris isn't quite what it is on Darwin
|
||||
if [[ ${CHOST} == *-solaris* ]] ; then
|
||||
sed -i -e 's/execinfo\.h/blablabla.h/' \
|
||||
Source/kwsys/CMakeLists.txt || die
|
||||
fi
|
||||
|
||||
# bootstrap script isn't exactly /bin/sh compatible
|
||||
tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
|
||||
--prefix="${T}/cmakestrap/" \
|
||||
--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
|
||||
|| die "Bootstrap failed"
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
if [[ -z ${EPREFIX} ]] ; then
|
||||
local file
|
||||
local errant_files=()
|
||||
|
||||
# See bug #599684 and bug #753581 (at least)
|
||||
for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
|
||||
if [[ -e ${file} ]]; then
|
||||
errant_files+=( "${file}" )
|
||||
fi
|
||||
done
|
||||
|
||||
# If errant files exist
|
||||
if [[ ${#errant_files[@]} -gt 0 ]]; then
|
||||
eerror "Errant files found!"
|
||||
eerror "The presence of these files is known to confuse CMake's"
|
||||
eerror "library path logic. Please (re)move these files:"
|
||||
|
||||
for file in "${errant_files[@]}"; do
|
||||
eerror " mv ${file} ${file}.bak"
|
||||
done
|
||||
|
||||
die "Stray files found in /etc/, see above message"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
|
||||
default
|
||||
else
|
||||
cd "${DISTDIR}" || die
|
||||
|
||||
# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
|
||||
verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
|
||||
verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
|
||||
|
||||
cd "${WORKDIR}" || die
|
||||
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# Disable Xcode hooks, bug #652134
|
||||
sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
|
||||
Source/CMakeLists.txt || die
|
||||
sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
|
||||
-e '/cmGlobalXCodeGenerator.h/d' \
|
||||
Source/cmake.cxx || die
|
||||
# Disable system integration, bug #933744
|
||||
sed -i -e 's/__APPLE__/__DISABLED__/' \
|
||||
Source/cmFindProgramCommand.cxx \
|
||||
Source/CPack/cmCPackGeneratorFactory.cxx || die
|
||||
sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \
|
||||
Source/cmMachO.cxx || die
|
||||
sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \
|
||||
Source/CMakeLists.txt || die
|
||||
|
||||
# Disable isysroot usage with GCC, we've properly instructed
|
||||
# where things are via GCC configuration and ldwrapper
|
||||
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
|
||||
Modules/Platform/Apple-GNU-*.cmake || die
|
||||
# Disable isysroot usage with clang as well
|
||||
sed -i -e '/_SYSROOT_FLAG/d' \
|
||||
Modules/Platform/Apple-Clang.cmake || die
|
||||
# Don't set a POSIX standard, system headers don't like that, #757426
|
||||
sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
|
||||
Source/cmLoadCommandCommand.cxx \
|
||||
Source/cmStandardLexer.h \
|
||||
Source/cmSystemTools.cxx \
|
||||
Source/cmTimestamp.cxx
|
||||
sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
|
||||
Source/cmStandardLexer.h
|
||||
fi
|
||||
|
||||
# Add gcc libs to the default link paths
|
||||
sed -i \
|
||||
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
|
||||
-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
|
||||
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
|
||||
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
|
||||
|
||||
## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must*
|
||||
## handle them as part of bootstrapping, sadly.
|
||||
|
||||
# Fix linking on Solaris
|
||||
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
|
||||
|
||||
# ODR warnings, bug #858335
|
||||
# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
|
||||
filter-lto
|
||||
|
||||
# 4.0.0_rc1 is missing this, fails to configure
|
||||
# https://gitlab.kitware.com/cmake/cmake/-/issues/26712
|
||||
touch .clang-tidy Utilities/.clang-tidy || die
|
||||
|
||||
if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
|
||||
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
|
||||
cmake_src_bootstrap
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_USE_SYSTEM_LIBRARIES=ON
|
||||
-DCMake_ENABLE_DEBUGGER=$(usex dap)
|
||||
-DCMAKE_DOC_DIR=/share/doc/${PF}
|
||||
-DCMAKE_MAN_DIR=/share/man
|
||||
-DCMAKE_DATA_DIR=/share/${PN}
|
||||
-DSPHINX_MAN=$(usex doc)
|
||||
-DSPHINX_HTML=$(usex doc)
|
||||
-DBUILD_CursesDialog="$(usex ncurses)"
|
||||
-DBUILD_TESTING=$(usex test)
|
||||
-DBUILD_QtDialog=$(usex gui)
|
||||
)
|
||||
|
||||
use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 )
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Fix OutDir and SelectLibraryConfigurations tests
|
||||
# these are altered thanks to our eclass
|
||||
sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
|
||||
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
|
||||
|| die
|
||||
|
||||
unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS
|
||||
|
||||
pushd "${BUILD_DIR}" > /dev/null || die
|
||||
|
||||
# Excluded tests:
|
||||
# BootstrapTest: we actually bootstrap it every time so why test it?
|
||||
# BundleUtilities: bundle creation broken
|
||||
# CMakeOnly.AllFindModules: pthread issues
|
||||
# CTest.updatecvs: which fails to commit as root
|
||||
# Fortran: requires fortran
|
||||
# RunCMake.CompilerLauncher: also requires fortran
|
||||
# RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
|
||||
# debugedit binary is not in the expected location
|
||||
# RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
|
||||
# it can't find a deb package that owns libc
|
||||
# TestUpload, which requires network access
|
||||
# RunCMake.CMP0125, known failure reported upstream (bug #829414)
|
||||
local myctestargs=(
|
||||
--output-on-failure
|
||||
-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
|
||||
)
|
||||
|
||||
local -x QT_QPA_PLATFORM=offscreen
|
||||
|
||||
cmake_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
# If USE=doc, there'll be newly generated docs which we install instead.
|
||||
if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
|
||||
doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
|
||||
fi
|
||||
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins Auxiliary/vim/syntax/cmake.vim
|
||||
|
||||
insinto /usr/share/vim/vimfiles/indent
|
||||
doins Auxiliary/vim/indent/cmake.vim
|
||||
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/${PN}.vim"
|
||||
|
||||
dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use gui; then
|
||||
xdg_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
if use gui; then
|
||||
xdg_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
fi
|
||||
}
|
||||
@ -102,6 +102,7 @@ PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
|
||||
|
||||
# Upstream fixes (can usually be removed with a version bump)
|
||||
"${FILESDIR}/${PN}-4.1.1-curl-8.16.0.patch"
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
|
||||
@ -102,6 +102,7 @@ PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
|
||||
|
||||
# Upstream fixes (can usually be removed with a version bump)
|
||||
"${FILESDIR}/${PN}-4.1.1-curl-8.16.0.patch"
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
https://github.com/Kitware/CMake/commit/c92268f91b30e6d52b82d1ffad227cadafcf4dbf
|
||||
From: Matt Jolly <kangie@gentoo.org>
|
||||
Date: Thu, 11 Sep 2025 11:20:42 +1000
|
||||
Subject: [PATCH] cmCTestCurl: Avoid using undocumented type for
|
||||
CURLOPT_PROXYTYPE values
|
||||
|
||||
Since upstream curl commit `1a12663d06` (CURLOPT: bump `CURLPROXY_*`
|
||||
enums to `long`, drop casts, 2025-07-28), the `CURLPROXY_*` constants
|
||||
are integer literals instead of `enum curl_proxytype`. It turns out
|
||||
that `curl_easy_setopt` has always expected a `long` anyway, and that
|
||||
`curl_proxytype` is not documented for public use.
|
||||
|
||||
Rebased for 3.28.5
|
||||
|
||||
Signed-off-by: Matt Jolly <kangie@gentoo.org>
|
||||
--- a/Source/CTest/cmCTestCurl.h
|
||||
+++ b/Source/CTest/cmCTestCurl.h
|
||||
@@ -44,7 +44,7 @@ private:
|
||||
std::vector<std::string> HttpHeaders;
|
||||
std::string HTTPProxyAuth;
|
||||
std::string HTTPProxy;
|
||||
- curl_proxytype HTTPProxyType;
|
||||
+ long HTTPProxyType;
|
||||
bool VerifyHostOff;
|
||||
bool VerifyPeerOff;
|
||||
bool UseHttp10;
|
||||
--
|
||||
2.49.1
|
||||
24
sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-4.1.1-curl-8.16.0.patch
vendored
Normal file
24
sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-4.1.1-curl-8.16.0.patch
vendored
Normal file
@ -0,0 +1,24 @@
|
||||
https://github.com/Kitware/CMake/commit/c92268f91b30e6d52b82d1ffad227cadafcf4dbf
|
||||
From: Brad King <brad.king@kitware.com>
|
||||
Date: Tue, 2 Sep 2025 11:41:10 -0400
|
||||
Subject: [PATCH] cmCTestCurl: Avoid using undocumented type for
|
||||
CURLOPT_PROXYTYPE values
|
||||
|
||||
Since upstream curl commit `1a12663d06` (CURLOPT: bump `CURLPROXY_*`
|
||||
enums to `long`, drop casts, 2025-07-28), the `CURLPROXY_*` constants
|
||||
are integer literals instead of `enum curl_proxytype`. It turns out
|
||||
that `curl_easy_setopt` has always expected a `long` anyway, and that
|
||||
`curl_proxytype` is not documented for public use.
|
||||
|
||||
Fixes: #27178
|
||||
--- a/Source/CTest/cmCTestCurl.h
|
||||
+++ b/Source/CTest/cmCTestCurl.h
|
||||
@@ -52,7 +52,7 @@ class cmCTestCurl
|
||||
std::vector<std::string> HttpHeaders;
|
||||
std::string HTTPProxyAuth;
|
||||
std::string HTTPProxy;
|
||||
- curl_proxytype HTTPProxyType;
|
||||
+ long HTTPProxyType;
|
||||
bool UseHttp10 = false;
|
||||
bool Quiet = false;
|
||||
int TimeOutSeconds = 0;
|
||||
Loading…
x
Reference in New Issue
Block a user