mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-16 06:41:38 +01:00
dev-util/cmake: Sync with gentoo
Needed by the updated eclasses. It's from gentoo commit d7869179b1bd60af77318cfb73447dd93d05da50.
This commit is contained in:
Krzesimir Nowak
parent
7a47eaae7c
commit
6d6e68b430
@ -1,4 +1,3 @@
|
||||
DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
|
||||
DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
|
||||
DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
|
||||
DIST cmake-3.20.2.tar.gz 9438694 BLAKE2B b1e1c091047d5ccae77d64ffda8201cfa7661f09fac2aceadfede8be09257cebdc8c2536f10ced82c700fd87174979344489fa6ab1b460e3ddfc41325ca6f19b SHA512 675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32
|
||||
DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
|
||||
DIST cmake-3.21.4.tar.gz 9630991 BLAKE2B ca6b6c50d984cc6713f3e88e1a6438c360d80c34927e60a20cc006ba47df2b91a290f1578d556f58d2d40711848a9b9caf36f65a043df892b81c1d48e3edb0d8 SHA512 0262a666f6da106576c26215580c40b54497bcdac400e847e1799716c31c71068293e719416338132a7da6122826c08ff50ac23dfed2711ab42631e96303f544
|
||||
DIST cmake-3.22.1.tar.gz 9778031 BLAKE2B 8c91e9e666ece94e0cfb5868ad257b1de824206b6f5420a5f516f684e4fd655e634918c59955f41a3f27b604b76946d86ab51cf975de7052c067a9dc4f952400 SHA512 b1e900fe573cd1cc76d26386f2298d7722737c9ff67930ee108994972b4561ef69caeb537177c9b95b7f17b755e20e034825d3807ea0d2dd4c391310b03adc11
|
||||
|
||||
@ -1,230 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
CMAKE_MAKEFILE_GENERATOR="emake"
|
||||
CMAKE_REMOVE_MODULES_LIST=( none )
|
||||
inherit bash-completion-r1 cmake elisp-common flag-o-matic toolchain-funcs virtualx xdg-utils
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
|
||||
DESCRIPTION="Cross platform Make"
|
||||
HOMEPAGE="https://cmake.org/"
|
||||
SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="CMake"
|
||||
SLOT="0"
|
||||
[[ "${PV}" = *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="doc emacs system-jsoncpp ncurses qt5"
|
||||
|
||||
RDEPEND="
|
||||
app-crypt/rhash
|
||||
>=app-arch/libarchive-3.0.0:=
|
||||
>=dev-libs/expat-2.0.1
|
||||
>=dev-libs/libuv-1.10.0:=
|
||||
>=net-misc/curl-7.21.5[ssl]
|
||||
sys-libs/zlib
|
||||
virtual/pkgconfig
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
ncurses? ( sys-libs/ncurses:0= )
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
)
|
||||
system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
doc? (
|
||||
dev-python/requests
|
||||
dev-python/sphinx
|
||||
)
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
PATCHES=(
|
||||
# prefix
|
||||
"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
|
||||
"${FILESDIR}"/${PN}-3.13.4-prefix-dirs.patch
|
||||
"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
|
||||
|
||||
# handle gentoo packaging in find modules
|
||||
"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
|
||||
"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
|
||||
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
|
||||
|
||||
# respect python eclasses
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
|
||||
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
|
||||
|
||||
# boost (#660980)
|
||||
"${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
|
||||
|
||||
# upstream fixes (can usually be removed with a version bump)
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
# Cleanup args to extract only JOBS.
|
||||
# Because bootstrap does not know anything else.
|
||||
grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
|
||||
if [[ $? -eq 0 ]] ; then
|
||||
par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
|
||||
par_arg="--parallel=${par_arg}"
|
||||
else
|
||||
par_arg="--parallel=1"
|
||||
fi
|
||||
|
||||
# disable running of cmake in boostrap 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
|
||||
|
||||
tc-export CC CXX LD
|
||||
|
||||
# bootstrap script isn't exactly /bin/sh compatible
|
||||
${CONFIG_SHELL:-sh} ./bootstrap \
|
||||
--prefix="${T}/cmakestrap/" \
|
||||
${par_arg} \
|
||||
|| die "Bootstrap failed"
|
||||
}
|
||||
|
||||
cmake_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
|
||||
|
||||
pushd "${BUILD_DIR}" > /dev/null
|
||||
|
||||
local ctestargs
|
||||
[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
|
||||
|
||||
# Excluded tests:
|
||||
# BootstrapTest: we actualy 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
|
||||
"${BUILD_DIR}"/bin/ctest \
|
||||
-j "$(makeopts_jobs)" \
|
||||
--test-load "$(makeopts_loadavg)" \
|
||||
${ctestargs} \
|
||||
-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
|
||||
|| die "Tests failed"
|
||||
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
# disable Xcode hooks, bug #652134
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
|
||||
Source/cmGlobalXCodeGenerator.cxx || die
|
||||
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"
|
||||
if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
|
||||
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
|
||||
cmake_src_bootstrap
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Fix linking on Solaris
|
||||
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
|
||||
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_USE_SYSTEM_LIBRARIES=ON
|
||||
-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
|
||||
-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)"
|
||||
)
|
||||
|
||||
if use qt5 ; then
|
||||
mycmakeargs+=(
|
||||
-DBUILD_QtDialog=ON
|
||||
$(cmake_use_find_package qt5 Qt5Widgets)
|
||||
)
|
||||
fi
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile
|
||||
use emacs && elisp-compile Auxiliary/cmake-mode.el
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx cmake_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
if use emacs; then
|
||||
elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
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}
|
||||
|
||||
rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
if use qt5; then
|
||||
xdg_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
if use qt5; then
|
||||
xdg_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
fi
|
||||
}
|
||||
@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
|
||||
LICENSE="CMake"
|
||||
SLOT="0"
|
||||
[[ "${PV}" = *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="doc emacs ncurses qt5 test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
@ -120,7 +120,7 @@ cmake_src_test() {
|
||||
-j "$(makeopts_jobs)" \
|
||||
--test-load "$(makeopts_loadavg)" \
|
||||
${ctestargs} \
|
||||
-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
|
||||
-E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
|
||||
|| die "Tests failed"
|
||||
|
||||
popd > /dev/null
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
CMAKE_MAKEFILE_GENERATOR="emake" # Fixed in 3.19, see commit 491dddfb; bug #596460
|
||||
CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
|
||||
CMAKE_REMOVE_MODULES_LIST=( none )
|
||||
inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
|
||||
toolchain-funcs virtualx xdg-utils
|
||||
@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
|
||||
LICENSE="CMake"
|
||||
SLOT="0"
|
||||
[[ "${PV}" = *_rc* ]] || \
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="doc emacs ncurses qt5 test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
@ -55,12 +55,12 @@ PATCHES=(
|
||||
# prefix
|
||||
"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
|
||||
"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
|
||||
# Next patch requires new work from prefix people
|
||||
#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
|
||||
"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
|
||||
|
||||
# handle gentoo packaging in find modules
|
||||
"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
|
||||
"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
|
||||
# Next patch needs to be reworked
|
||||
#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
|
||||
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
|
||||
|
||||
# respect python eclasses
|
||||
@ -120,7 +120,7 @@ cmake_src_test() {
|
||||
-j "$(makeopts_jobs)" \
|
||||
--test-load "$(makeopts_loadavg)" \
|
||||
${ctestargs} \
|
||||
-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
|
||||
-E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
|
||||
|| die "Tests failed"
|
||||
|
||||
popd > /dev/null
|
||||
@ -129,10 +129,28 @@ cmake_src_test() {
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
# disable Xcode hooks, bug #652134
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
|
||||
Source/cmGlobalXCodeGenerator.cxx || die
|
||||
# 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 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
|
||||
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
|
||||
CMAKE_REMOVE_MODULES_LIST=( none )
|
||||
@ -1,43 +0,0 @@
|
||||
--- a/Modules/FindLAPACK.cmake
|
||||
+++ b/Modules/FindLAPACK.cmake
|
||||
@@ -4,6 +4,10 @@
|
||||
#
|
||||
# Find LAPACK library
|
||||
#
|
||||
+# Version modified for Gentoo Linux.
|
||||
+# If a valid PkgConfig configuration is found, this overrides and cancels
|
||||
+# all further checks.
|
||||
+#
|
||||
# This module finds an installed fortran library that implements the
|
||||
# LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
|
||||
#
|
||||
@@ -140,6 +144,23 @@
|
||||
|
||||
endmacro()
|
||||
|
||||
+#
|
||||
+# first, try PkgConfig
|
||||
+#
|
||||
+find_package(PkgConfig REQUIRED)
|
||||
+pkg_check_modules(PC_LAPACK lapack)
|
||||
+if(PC_LAPACK_FOUND)
|
||||
+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
|
||||
+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
|
||||
+ if (NOT ${PC_LIB}_LIBRARY)
|
||||
+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
|
||||
+ endif (NOT ${PC_LIB}_LIBRARY)
|
||||
+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
|
||||
+ endforeach(PC_LIB)
|
||||
+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
|
||||
+ mark_as_advanced(LAPACK_LIBRARIES)
|
||||
+else(PC_LAPACK_FOUND)
|
||||
+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
|
||||
|
||||
set(LAPACK_LINKER_FLAGS)
|
||||
set(LAPACK_LIBRARIES)
|
||||
@@ -348,3 +369,5 @@
|
||||
endif()
|
||||
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||
+
|
||||
+endif(PC_LAPACK_FOUND)
|
||||
@ -1,48 +0,0 @@
|
||||
Do not detect Xcode and set -isysroot for its SDK, since that messes up
|
||||
our toolchain, and hence makes any compilation fail, bug #445308
|
||||
|
||||
--- a/Modules/Platform/Darwin-Initialize.cmake
|
||||
+++ b/Modules/Platform/Darwin-Initialize.cmake
|
||||
@@ -1,16 +1,16 @@
|
||||
# Ask xcode-select where to find /Developer or fall back to ancient location.
|
||||
-execute_process(COMMAND xcode-select -print-path
|
||||
- OUTPUT_VARIABLE _stdout
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- ERROR_VARIABLE _stderr
|
||||
- RESULT_VARIABLE _failed)
|
||||
-if(NOT _failed AND IS_DIRECTORY ${_stdout})
|
||||
- set(OSX_DEVELOPER_ROOT ${_stdout})
|
||||
-elseif(IS_DIRECTORY "/Developer")
|
||||
- set(OSX_DEVELOPER_ROOT "/Developer")
|
||||
-else()
|
||||
+#execute_process(COMMAND xcode-select -print-path
|
||||
+# OUTPUT_VARIABLE _stdout
|
||||
+# OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
+# ERROR_VARIABLE _stderr
|
||||
+# RESULT_VARIABLE _failed)
|
||||
+#if(NOT _failed AND IS_DIRECTORY ${_stdout})
|
||||
+# set(OSX_DEVELOPER_ROOT ${_stdout})
|
||||
+#elseif(IS_DIRECTORY "/Developer")
|
||||
+# set(OSX_DEVELOPER_ROOT "/Developer")
|
||||
+#else()
|
||||
set(OSX_DEVELOPER_ROOT "")
|
||||
-endif()
|
||||
+#endif()
|
||||
|
||||
execute_process(COMMAND sw_vers -productVersion
|
||||
OUTPUT_VARIABLE CURRENT_OSX_VERSION
|
||||
@@ -91,10 +91,10 @@
|
||||
# CMAKE_OSX_DEPLOYMENT_TARGET
|
||||
|
||||
# Set cache variable - end user may change this during ccmake or cmake-gui configure.
|
||||
-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
|
||||
- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
|
||||
- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
|
||||
-endif()
|
||||
+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
|
||||
+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
|
||||
+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
|
||||
+#endif()
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# CMAKE_OSX_SYSROOT
|
||||
@ -1,23 +0,0 @@
|
||||
--- a/Modules/FindBLAS.cmake
|
||||
+++ b/Modules/FindBLAS.cmake
|
||||
@@ -4,6 +4,10 @@
|
||||
#
|
||||
# Find BLAS library
|
||||
#
|
||||
+# Version modified for Gentoo Linux.
|
||||
+# If a valid PkgConfig configuration is found, this overrides and cancels
|
||||
+# all further checks.
|
||||
+#
|
||||
# This module finds an installed fortran library that implements the
|
||||
# BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
|
||||
# list of libraries searched for is taken from the autoconf macro file,
|
||||
@@ -50,6 +54,9 @@
|
||||
# (To distribute this file outside of CMake, substitute the full
|
||||
# License text for the above reference.)
|
||||
|
||||
+# first, try PkgConfig
|
||||
+set(BLA_PREFER_PKGCONFIG On)
|
||||
+
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
https://bugs.gentoo.org/660980
|
||||
|
||||
--- cmake-3.11.4/Modules/FindBoost.cmake
|
||||
+++ cmake-3.11.4/Modules/FindBoost.cmake
|
||||
@@ -1680,7 +1680,7 @@
|
||||
list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
|
||||
list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
|
||||
# Gentoo
|
||||
- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
|
||||
+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}.${COMPONENT_PYTHON_VERSION_MINOR}")
|
||||
# RPMs
|
||||
list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
|
||||
endif()
|
||||
@ -1,127 +0,0 @@
|
||||
From b1f045122fb210728081ae2165197aebff4ee498 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Fri, 9 Jun 2017 01:47:55 +0200
|
||||
Subject: [PATCH] Set some proper paths to make cmake find our tools.
|
||||
|
||||
The ebuild now adds an extra / at the end of $EPREFIX so that it is
|
||||
never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
|
||||
correct)
|
||||
|
||||
Original patch by Heiko Przybyl.
|
||||
Updated by Chris Reffett (cmake-2.8.8)
|
||||
Updated by Johannes Huber (cmake-2.8.9)
|
||||
Updated by Michael Palimaka (cmake-2.8.10)
|
||||
Updated by Chris Reffett (cmake-2.8.11)
|
||||
Updated by Michael Palimaka (cmake-3.0.0)
|
||||
Updated by Lars Wendler (cmake-3.9.0_rc2)
|
||||
---
|
||||
Modules/Platform/Darwin.cmake | 12 ++++++++----
|
||||
Modules/Platform/UnixPaths.cmake | 29 ++++++++++++++++++++++++-----
|
||||
2 files changed, 32 insertions(+), 9 deletions(-)
|
||||
|
||||
Index: cmake-3.13.3/Modules/Platform/Darwin.cmake
|
||||
===================================================================
|
||||
--- cmake-3.13.3.orig/Modules/Platform/Darwin.cmake
|
||||
+++ cmake-3.13.3/Modules/Platform/Darwin.cmake
|
||||
@@ -108,9 +108,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
|
||||
set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
|
||||
set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
|
||||
|
||||
-# default to searching for frameworks first
|
||||
+# default to searching for frameworks last
|
||||
if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
|
||||
- set(CMAKE_FIND_FRAMEWORK FIRST)
|
||||
+ set(CMAKE_FIND_FRAMEWORK LAST)
|
||||
endif()
|
||||
|
||||
# Older OS X linkers do not report their framework search path
|
||||
@@ -132,6 +132,8 @@ endif()
|
||||
|
||||
# set up the default search directories for frameworks
|
||||
set(CMAKE_SYSTEM_FRAMEWORK_PATH
|
||||
+ @GENTOO_PORTAGE_EPREFIX@Frameworks
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib
|
||||
~/Library/Frameworks
|
||||
)
|
||||
if(_CMAKE_OSX_SYSROOT_PATH)
|
||||
@@ -178,13 +180,15 @@ if(CMAKE_OSX_SYSROOT)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-# default to searching for application bundles first
|
||||
+# default to searching for application bundles last
|
||||
if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
|
||||
- set(CMAKE_FIND_APPBUNDLE FIRST)
|
||||
+ set(CMAKE_FIND_APPBUNDLE LAST)
|
||||
endif()
|
||||
# set up the default search directories for application bundles
|
||||
set(_apps_paths)
|
||||
foreach(_path
|
||||
+ @GENTOO_PORTAGE_EPREFIX@Applications
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/bin
|
||||
"~/Applications"
|
||||
"/Applications"
|
||||
"${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
|
||||
Index: cmake-3.13.3/Modules/Platform/UnixPaths.cmake
|
||||
===================================================================
|
||||
--- cmake-3.13.3.orig/Modules/Platform/UnixPaths.cmake
|
||||
+++ cmake-3.13.3/Modules/Platform/UnixPaths.cmake
|
||||
@@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DI
|
||||
# search types.
|
||||
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
# Standard
|
||||
- /usr/local /usr /
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
|
||||
+ @GENTOO_HOST@/usr/local /usr /
|
||||
|
||||
# CMake install location
|
||||
"${_CMAKE_INSTALL_DIR}"
|
||||
@@ -50,23 +51,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
|
||||
# List common include file locations not under the common prefixes.
|
||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||||
- # X11
|
||||
- /usr/include/X11
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/include
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
||||
- # X11
|
||||
- /usr/lib/X11
|
||||
+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
|
||||
+ @GENTOO_PORTAGE_GCCLIBDIR@
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib
|
||||
+ @GENTOO_PORTAGE_EPREFIX@lib
|
||||
+ )
|
||||
+
|
||||
+list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/bin
|
||||
+ @GENTOO_PORTAGE_EPREFIX@bin
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
|
||||
+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
|
||||
+ @GENTOO_PORTAGE_GCCLIBDIR@
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib
|
||||
+ @GENTOO_PORTAGE_EPREFIX@lib
|
||||
+ @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
- /usr/include
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/include
|
||||
+ @GENTOO_HOST@/usr/include
|
||||
)
|
||||
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
- /usr/include
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/include
|
||||
+ @GENTOO_HOST@/usr/include
|
||||
)
|
||||
list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
@ -1,56 +0,0 @@
|
||||
From 7459f27dd4bb9b60067ac49ee2c6be93d20c2c1e Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Thu, 13 Feb 2020 13:16:16 +0100
|
||||
Subject: [PATCH] Prefer pkgconfig in FindLAPACK
|
||||
|
||||
---
|
||||
Modules/FindLAPACK.cmake | 22 ++++++++++++++++++++++
|
||||
1 file changed, 22 insertions(+)
|
||||
|
||||
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
|
||||
index c9629769f0..de852d562c 100644
|
||||
--- a/Modules/FindLAPACK.cmake
|
||||
+++ b/Modules/FindLAPACK.cmake
|
||||
@@ -7,6 +7,10 @@ FindLAPACK
|
||||
|
||||
Find Linear Algebra PACKage (LAPACK) library
|
||||
|
||||
+Version modified for Gentoo Linux.
|
||||
+If a valid PkgConfig configuration is found, this overrides and cancels
|
||||
+all further checks.
|
||||
+
|
||||
This module finds an installed Fortran library that implements the
|
||||
LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
|
||||
|
||||
@@ -186,6 +190,22 @@ macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _a
|
||||
#message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
|
||||
endmacro()
|
||||
|
||||
+# first, try PkgConfig
|
||||
+find_package(PkgConfig REQUIRED)
|
||||
+pkg_check_modules(PC_LAPACK lapack)
|
||||
+if(PC_LAPACK_FOUND)
|
||||
+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
|
||||
+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
|
||||
+ if (NOT ${PC_LIB}_LIBRARY)
|
||||
+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
|
||||
+ endif (NOT ${PC_LIB}_LIBRARY)
|
||||
+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
|
||||
+ endforeach(PC_LIB)
|
||||
+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
|
||||
+ mark_as_advanced(LAPACK_LIBRARIES)
|
||||
+else(PC_LAPACK_FOUND)
|
||||
+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
|
||||
+
|
||||
set(LAPACK_LINKER_FLAGS)
|
||||
set(LAPACK_LIBRARIES)
|
||||
set(LAPACK95_LIBRARIES)
|
||||
@@ -494,3 +514,5 @@ endif()
|
||||
|
||||
cmake_pop_check_state()
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||
+
|
||||
+endif(PC_LAPACK_FOUND)
|
||||
--
|
||||
2.25.0
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
Don't use .so for modules on darwin/macos. Use .bundle instead.
|
||||
Patch by Heiko Przybyl
|
||||
|
||||
Forward-ported from 2.8.10 to 3.4.0-rc1
|
||||
|
||||
--- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
|
||||
+++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
|
||||
@@ -26,7 +26,7 @@
|
||||
set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
|
||||
set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
|
||||
set(CMAKE_SHARED_MODULE_PREFIX "lib")
|
||||
-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
|
||||
+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
|
||||
set(CMAKE_MODULE_EXISTS 1)
|
||||
set(CMAKE_DL_LIBS "")
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
|
||||
set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
|
||||
set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
|
||||
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
|
||||
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a")
|
||||
|
||||
# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
|
||||
# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
|
||||
@ -1,13 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>kde@gentoo.org</email>
|
||||
<name>Gentoo KDE Project</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:cmake_project:cmake</remote-id>
|
||||
</upstream>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user