[arch-commits] Commit in cmake/repos/extra-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Thu Jul 30 21:45:36 UTC 2020
Date: Thursday, July 30, 2020 @ 21:45:36
Author: arojas
Revision: 392749
archrelease: copy trunk to extra-x86_64
Added:
cmake/repos/extra-x86_64/PKGBUILD
(from rev 392748, cmake/trunk/PKGBUILD)
cmake/repos/extra-x86_64/cmake-cppflags.patch
(from rev 392748, cmake/trunk/cmake-cppflags.patch)
cmake/repos/extra-x86_64/rebuild.list
(from rev 392748, cmake/trunk/rebuild.list)
Deleted:
cmake/repos/extra-x86_64/PKGBUILD
cmake/repos/extra-x86_64/cmake-cppflags.patch
cmake/repos/extra-x86_64/rebuild.list
----------------------+
PKGBUILD | 97 +++++++++++++++++++++++--------------------------
cmake-cppflags.patch | 52 +++++++++++++-------------
rebuild.list | 4 +-
3 files changed, 75 insertions(+), 78 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-30 21:45:22 UTC (rev 392748)
+++ PKGBUILD 2020-07-30 21:45:36 UTC (rev 392749)
@@ -1,50 +0,0 @@
-# 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.18.0
-pkgrel=3
-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
- cmake-crash-qt5.15.patch::"https://gitlab.kitware.com/cmake/cmake/-/commit/4b1c6f90.patch")
-sha512sums=('6cab76a792a7ed2120a50048312273b2870afef29351a3ebcbf76cbcb422f82be679c85211c19016a56ac7f63bbce6cea0478f491c973b8577e08168a1ba853d'
- '407c5c63a31266e44641ada8229dbc33df44df98e5bb575db3a33590e8ffdff9aea3f2ee5cb0cb855858facf1e46c63886dea9f948a0cad2da042e7f7f258cac'
- '7542613768b840558d86cdeeeb624b73fe274ffb8b1aca9df2a96dafdd31d2b4b61a8f99104ba4c3f408cd3baa0ef22f21cd24468f6cac776a5f9c70d82af156')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i ../cmake-cppflags.patch # Honor CPPFLAGS https://gitlab.kitware.com/cmake/cmake/issues/12928
- patch -p1 -i ../cmake-crash-qt5.15.patch # Fix crash with Qt 5.15
-}
-
-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
-
- 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/extra-x86_64/PKGBUILD (from rev 392748, cmake/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-30 21:45:36 UTC (rev 392749)
@@ -0,0 +1,47 @@
+# 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.18.1
+pkgrel=1
+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=('e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468'
+ '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
+
+ 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
+}
Deleted: cmake-cppflags.patch
===================================================================
--- cmake-cppflags.patch 2020-07-30 21:45:22 UTC (rev 392748)
+++ cmake-cppflags.patch 2020-07-30 21:45:36 UTC (rev 392749)
@@ -1,26 +0,0 @@
-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/extra-x86_64/cmake-cppflags.patch (from rev 392748, cmake/trunk/cmake-cppflags.patch)
===================================================================
--- cmake-cppflags.patch (rev 0)
+++ cmake-cppflags.patch 2020-07-30 21:45:36 UTC (rev 392749)
@@ -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")
+
Deleted: rebuild.list
===================================================================
--- rebuild.list 2020-07-30 21:45:22 UTC (rev 392748)
+++ rebuild.list 2020-07-30 21:45:36 UTC (rev 392749)
@@ -1,2 +0,0 @@
-cmake-fedora
-uranium
Copied: cmake/repos/extra-x86_64/rebuild.list (from rev 392748, cmake/trunk/rebuild.list)
===================================================================
--- rebuild.list (rev 0)
+++ rebuild.list 2020-07-30 21:45:36 UTC (rev 392749)
@@ -0,0 +1,2 @@
+cmake-fedora
+uranium
More information about the arch-commits
mailing list