Date: Tuesday, December 21, 2021 @ 19:34:47 Author: arojas Revision: 432880
Remove CPPFLAGS patch, it's now dealt with in devtools Modified: cmake/trunk/PKGBUILD Deleted: cmake/trunk/cmake-cppflags.patch ----------------------+ PKGBUILD | 14 +++----------- cmake-cppflags.patch | 26 -------------------------- 2 files changed, 3 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-21 19:29:45 UTC (rev 432879) +++ PKGBUILD 2021-12-21 19:34:47 UTC (rev 432880) @@ -4,7 +4,7 @@ pkgname=cmake pkgver=3.22.1 -pkgrel=3 +pkgrel=4 pkgdesc='A cross-platform open-source make system' arch=('x86_64') url="https://www.cmake.org/" @@ -12,19 +12,11 @@ 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') +source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") +sha512sums=('b1e900fe573cd1cc76d26386f2298d7722737c9ff67930ee108994972b4561ef69caeb537177c9b95b7f17b755e20e034825d3807ea0d2dd4c391310b03adc11') -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 \ Deleted: cmake-cppflags.patch =================================================================== --- cmake-cppflags.patch 2021-12-21 19:29:45 UTC (rev 432879) +++ cmake-cppflags.patch 2021-12-21 19:34:47 UTC (rev 432880) @@ -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") -