[arch-commits] Commit in cmake/repos (4 files)

[Antonio Rojas]

    Date: Friday, May 8, 2020 @ 06:58:03
  Author: arojas
Revision: 382764

archrelease: copy trunk to testing-x86_64

Added:
  cmake/repos/testing-x86_64/
  cmake/repos/testing-x86_64/PKGBUILD
    (from rev 382763, cmake/trunk/PKGBUILD)
  cmake/repos/testing-x86_64/cmake-cppflags.patch
    (from rev 382763, cmake/trunk/cmake-cppflags.patch)
  cmake/repos/testing-x86_64/rebuild.list
    (from rev 382763, cmake/trunk/rebuild.list)

----------------------+
 PKGBUILD             |   63 +++++++++++++++++++++++++++++++++++++++++++++++++
 cmake-cppflags.patch |   26 ++++++++++++++++++++
 rebuild.list         |    2 +
 3 files changed, 91 insertions(+)

Copied: cmake/repos/testing-x86_64/PKGBUILD (from rev 382763, cmake/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2020-05-08 06:58:03 UTC (rev 382764)
@@ -0,0 +1,63 @@
+# 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.17.2
+pkgrel=2
+pkgdesc='A cross-platform open-source make system'
+arch=('x86_64')
+url="https://www.cmake.org/"
+license=('custom')
+depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp' 'libjsoncpp.so' 'libuv' 'rhash')
+makedepends=('qt5-base' 'python-sphinx' 'emacs')
+optdepends=('qt5-base: cmake-gui')
+source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+         cmake-cppflags.patch)
+sha512sums=('4998ec3ac7367cec237187b1568a1935b402c39959c1869c9ae94e013060f6d2e03089eba34187f91063de169df78425dee2aa01acb925347aeb97f99bcad6a2'
+            '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 \
+    --sphinx-man \
+    --system-libs \
+    --qt-gui \
+    --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  vimpath="${pkgdir}/usr/share/vim/vimfiles"
+  install -d "${vimpath}"/{indent,syntax}
+  ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/indent/cmake.vim \
+    "${vimpath}"/indent/
+  ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/syntax/cmake.vim \
+    "${vimpath}"/syntax/
+
+  install -d "${pkgdir}"/usr/share/emacs/site-lisp/
+  emacs -batch -f batch-byte-compile \
+    "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
+  ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
+    "${pkgdir}"/usr/share/emacs/site-lisp/
+  ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.elc \
+    "${pkgdir}"/usr/share/emacs/site-lisp/
+
+  install -Dm644 Copyright.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+# install bash completions
+  mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+  ln -s /usr/share/cmake-${pkgver%.*}/completions/{cmake,cpack,ctest} "$pkgdir"/usr/share/bash-completion/completions
+}

Copied: cmake/repos/testing-x86_64/cmake-cppflags.patch (from rev 382763, cmake/trunk/cmake-cppflags.patch)
===================================================================
--- testing-x86_64/cmake-cppflags.patch	                        (rev 0)
+++ testing-x86_64/cmake-cppflags.patch	2020-05-08 06:58:03 UTC (rev 382764)
@@ -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/testing-x86_64/rebuild.list (from rev 382763, cmake/trunk/rebuild.list)
===================================================================
--- testing-x86_64/rebuild.list	                        (rev 0)
+++ testing-x86_64/rebuild.list	2020-05-08 06:58:03 UTC (rev 382764)
@@ -0,0 +1,2 @@
+cmake-fedora
+uranium