[arch-commits] Commit in cmake/repos (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Thu Dec 16 14:46:21 UTC 2021
Date: Thursday, December 16, 2021 @ 14:46:21
Author: arojas
Revision: 432600
archrelease: copy trunk to staging-x86_64
Added:
cmake/repos/staging-x86_64/
cmake/repos/staging-x86_64/PKGBUILD
(from rev 432599, cmake/trunk/PKGBUILD)
cmake/repos/staging-x86_64/cmake-cppflags.patch
(from rev 432599, cmake/trunk/cmake-cppflags.patch)
cmake/repos/staging-x86_64/rebuild.list
(from rev 432599, cmake/trunk/rebuild.list)
----------------------+
PKGBUILD | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
cmake-cppflags.patch | 26 ++++++++++++++++++++++++++
rebuild.list | 3 +++
3 files changed, 77 insertions(+)
Copied: cmake/repos/staging-x86_64/PKGBUILD (from rev 432599, cmake/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2021-12-16 14:46:21 UTC (rev 432600)
@@ -0,0 +1,48 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=3.22.1
+pkgrel=2
+pkgdesc='A cross-platform open-source make system'
+arch=('x86_64')
+url="https://www.cmake.org/"
+license=('custom')
+depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libjsoncpp.so' 'libuv' 'rhash')
+makedepends=('qt6-base' 'python-sphinx' 'emacs')
+optdepends=('qt6-base: cmake-gui')
+source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+ cmake-cppflags.patch)
+sha512sums=('b1e900fe573cd1cc76d26386f2298d7722737c9ff67930ee108994972b4561ef69caeb537177c9b95b7f17b755e20e034825d3807ea0d2dd4c391310b03adc11'
+ '407c5c63a31266e44641ada8229dbc33df44df98e5bb575db3a33590e8ffdff9aea3f2ee5cb0cb855858facf1e46c63886dea9f948a0cad2da042e7f7f258cac')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i ../cmake-cppflags.patch # Honor CPPFLAGS https://gitlab.kitware.com/cmake/cmake/issues/12928
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ export CXXFLAGS+=" ${CPPFLAGS}"
+ ./bootstrap --prefix=/usr \
+ --mandir=/share/man \
+ --docdir=/share/doc/cmake \
+ --datadir=/share/cmake \
+ --sphinx-man \
+ --system-libs \
+ --qt-gui \
+ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ emacs -batch -f batch-byte-compile \
+ "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Copied: cmake/repos/staging-x86_64/cmake-cppflags.patch (from rev 432599, cmake/trunk/cmake-cppflags.patch)
===================================================================
--- staging-x86_64/cmake-cppflags.patch (rev 0)
+++ staging-x86_64/cmake-cppflags.patch 2021-12-16 14:46:21 UTC (rev 432600)
@@ -0,0 +1,26 @@
+diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake
+index f6d620f40e..325b11f25e 100644
+--- a/Modules/CMakeCInformation.cmake
++++ b/Modules/CMakeCInformation.cmake
+@@ -100,7 +100,7 @@ if(NOT CMAKE_MODULE_EXISTS)
+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
+ endif()
+
+-set(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}")
++set(CMAKE_C_FLAGS_INIT "$ENV{CPPFLAGS} $ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}")
+
+ cmake_initialize_per_config_variable(CMAKE_C_FLAGS "Flags used by the C compiler")
+
+diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake
+index dbb4366757..8a0ee288c6 100644
+--- a/Modules/CMakeCXXInformation.cmake
++++ b/Modules/CMakeCXXInformation.cmake
+@@ -197,7 +197,7 @@ endforeach()
+ # on the initial values computed in the platform/*.cmake files
+ # use _INIT variables so that this only happens the first time
+ # and you can set these flags in the cmake cache
+-set(CMAKE_CXX_FLAGS_INIT "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
++set(CMAKE_CXX_FLAGS_INIT "$ENV{CPPFLAGS} $ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
+
+ cmake_initialize_per_config_variable(CMAKE_CXX_FLAGS "Flags used by the CXX compiler")
+
Copied: cmake/repos/staging-x86_64/rebuild.list (from rev 432599, cmake/trunk/rebuild.list)
===================================================================
--- staging-x86_64/rebuild.list (rev 0)
+++ staging-x86_64/rebuild.list 2021-12-16 14:46:21 UTC (rev 432600)
@@ -0,0 +1,3 @@
+cmake-fedora
+uranium
+openvdb
More information about the arch-commits
mailing list