[arch-commits] Commit in cmake/repos/staging-x86_64 (6 files)
Felix Yan
felixonmars at archlinux.org
Wed Jul 1 15:19:26 UTC 2020
Date: Wednesday, July 1, 2020 @ 15:19:25
Author: felixonmars
Revision: 390692
archrelease: copy trunk to staging-x86_64
Added:
cmake/repos/staging-x86_64/PKGBUILD
(from rev 390691, cmake/trunk/PKGBUILD)
cmake/repos/staging-x86_64/cmake-cppflags.patch
(from rev 390691, cmake/trunk/cmake-cppflags.patch)
cmake/repos/staging-x86_64/rebuild.list
(from rev 390691, cmake/trunk/rebuild.list)
Deleted:
cmake/repos/staging-x86_64/PKGBUILD
cmake/repos/staging-x86_64/cmake-cppflags.patch
cmake/repos/staging-x86_64/rebuild.list
----------------------+
PKGBUILD | 128 ++++++++++++++++++++++++-------------------------
cmake-cppflags.patch | 52 +++++++++----------
rebuild.list | 4 -
3 files changed, 93 insertions(+), 91 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-01 15:18:56 UTC (rev 390691)
+++ PKGBUILD 2020-07-01 15:19:25 UTC (rev 390692)
@@ -1,63 +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.17.3
-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=('13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69'
- '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/staging-x86_64/PKGBUILD (from rev 390691, cmake/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-01 15:19:25 UTC (rev 390692)
@@ -0,0 +1,65 @@
+# 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.3
+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)
+sha512sums=('13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69'
+ '407c5c63a31266e44641ada8229dbc33df44df98e5bb575db3a33590e8ffdff9aea3f2ee5cb0cb855858facf1e46c63886dea9f948a0cad2da042e7f7f258cac')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i ../cmake-cppflags.patch # Honor CPPFLAGS https://gitlab.kitware.com/cmake/cmake/issues/12928
+
+ sed -i 's/LUA_VERSIONS5 5.3/LUA_VERSIONS5 5.4 5.3/' Modules/FindLua.cmake # Add Lua 5.4 to search list
+}
+
+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
+}
Deleted: cmake-cppflags.patch
===================================================================
--- cmake-cppflags.patch 2020-07-01 15:18:56 UTC (rev 390691)
+++ cmake-cppflags.patch 2020-07-01 15:19:25 UTC (rev 390692)
@@ -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/staging-x86_64/cmake-cppflags.patch (from rev 390691, cmake/trunk/cmake-cppflags.patch)
===================================================================
--- cmake-cppflags.patch (rev 0)
+++ cmake-cppflags.patch 2020-07-01 15:19:25 UTC (rev 390692)
@@ -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-01 15:18:56 UTC (rev 390691)
+++ rebuild.list 2020-07-01 15:19:25 UTC (rev 390692)
@@ -1,2 +0,0 @@
-cmake-fedora
-uranium
Copied: cmake/repos/staging-x86_64/rebuild.list (from rev 390691, cmake/trunk/rebuild.list)
===================================================================
--- rebuild.list (rev 0)
+++ rebuild.list 2020-07-01 15:19:25 UTC (rev 390692)
@@ -0,0 +1,2 @@
+cmake-fedora
+uranium
More information about the arch-commits
mailing list