diff options
| -rw-r--r-- | .SRCINFO | 21 | ||||
| -rw-r--r-- | PKGBUILD | 39 | ||||
| -rw-r--r-- | cmake-cppflags.patch | 26 |
3 files changed, 54 insertions, 32 deletions
@@ -1,26 +1,29 @@ pkgbase = cmake-git pkgdesc = A cross-platform open-source make system - pkgver = 3.10.0.rc2.91.g6dec363028 + pkgver = 3.27.4.645.g72beefa91b pkgrel = 1 url = http://www.cmake.org/ arch = x86_64 license = custom - makedepends = qt5-base + makedepends = qt6-base makedepends = python-sphinx - makedepends = git - makedepends = ncurses makedepends = emacs + makedepends = nlohmann-json + makedepends = git depends = curl depends = libarchive - depends = shared-mime-info + depends = hicolor-icon-theme depends = jsoncpp + depends = libjsoncpp.so + depends = libuv depends = rhash - optdepends = qt5-base: cmake-gui - optdepends = libxkbcommon-x11: cmake-gui + depends = cppdap + optdepends = qt6-base: cmake-gui provides = cmake conflicts = cmake - source = git+https://cmake.org/cmake.git + source = git+https://gitlab.kitware.com/cmake/cmake.git + source = cmake-cppflags.patch md5sums = SKIP + md5sums = d7316e540d07e0a7ebce75951a7b2697 pkgname = cmake-git - @@ -9,7 +9,7 @@ # This PKGBUILD is based on the official Arch cmake package. pkgname=cmake-git -pkgver=3.10.0.rc2.91.g6dec363028 +pkgver=3.27.4.645.g72beefa91b pkgrel=1 pkgdesc='A cross-platform open-source make system' arch=('x86_64') @@ -17,13 +17,14 @@ url="http://www.cmake.org/" license=('custom') conflicts=('cmake') provides=('cmake') -depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp' 'rhash') -makedepends=('qt5-base' 'python-sphinx' 'git' 'ncurses' 'emacs') -optdepends=('qt5-base: cmake-gui' - 'libxkbcommon-x11: cmake-gui') -source=('git+https://cmake.org/cmake.git') -md5sums=('SKIP') -shortver=$(printf "${pkgver}" | sed 's/\([0-9]\+\.[0-9]\+\)\..*/\1/') +depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libjsoncpp.so' 'libuv' 'rhash' 'cppdap') +makedepends=('qt6-base' 'python-sphinx' 'emacs' 'nlohmann-json' 'git') +optdepends=('qt6-base: cmake-gui') +source=('git+https://gitlab.kitware.com/cmake/cmake.git' + 'cmake-cppflags.patch') +md5sums=('SKIP' + 'd7316e540d07e0a7ebce75951a7b2697') +#shortver=$(printf "${pkgver}" | sed 's/\([0-9]\+\.[0-9]\+\)\..*/\1/') pkgver() { cd "$srcdir/cmake" @@ -32,15 +33,19 @@ pkgver() { prepare() { cd "$srcdir/cmake" + patch -p1 -i ../cmake-cppflags.patch # Honor CPPFLAGS https://gitlab.kitware.com/cmake/cmake/issues/12928 } build() { cd "$srcdir/cmake" + export CXXFLAGS+=" ${CPPFLAGS}" ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ + --datadir=/share/cmake \ --sphinx-man \ + --sphinx-html \ --system-libs \ --qt-gui \ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) @@ -51,19 +56,7 @@ package() { cd "$srcdir/cmake" make DESTDIR="${pkgdir}" install - vimpath="${pkgdir}/usr/share/vim/vimfiles" - install -d "${vimpath}"/{help,indent,syntax} - ln -s /usr/share/cmake-${shortver}/editors/vim/indent/cmake.vim \ - "${vimpath}"/indent/ - ln -s /usr/share/cmake-${shortver}/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-${shortver}/editors/emacs/cmake-mode.el - ln -s /usr/share/cmake-${shortver}/editors/emacs/cmake-mode.el \ - "${pkgdir}"/usr/share/emacs/site-lisp/ - - install -Dm644 Copyright.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + rm -r "$pkgdir"/usr/share/doc/cmake/html/_sources + 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 } diff --git a/cmake-cppflags.patch b/cmake-cppflags.patch new file mode 100644 index 000000000000..ffac66c76ed2 --- /dev/null +++ b/cmake-cppflags.patch @@ -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") + |