Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [NoMerge] cmake: update to 3.19.0
@ 2020-11-21  0:25 ndowens
  2020-11-21  0:30 ` [PR REVIEW] " sgn
                   ` (21 more replies)
  0 siblings, 22 replies; 23+ messages in thread
From: ndowens @ 2020-11-21  0:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544

[NoMerge] cmake: update to 3.19.0


A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 10565 bytes --]

From e3eb6e4bf8bed312aa14a0789140548b83f54c52 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0

---
 srcpkgs/cmake-gui/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..3f468f63e1d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,11 +17,19 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
 depends="desktop-file-utils shared-mime-info"
 checkdepends="pax pkg-config"
 short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
+
+pre_configure() {
+	# TRY_RUN fails if being cross-built
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \
+			CMakeLists.txt
+	fi
+}
 
 do_install() {
 	# We are only interested in cmake-gui.

From f0d73cfbbe048b2e8760b0151e9d901a4f9a87a3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0

---
 srcpkgs/cmake/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..d450b43e362 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.18.4
+version=3.19.0
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,21 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
+
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \
+			CMakeLists.txt
+	fi
+}
+
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \
+			CMakeLists.txt
+	fi
+}
 
 pre_check() {
 	# use ctest of this build instead of requirig cmake to test cmake...

From 07962adfdcdd2c423cc9ced768c382fc8bb79d55 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0

---
 .../0001-Fix-undefined-CMAKE_DOC_DIR.patch    |  27 ++++
 .../patches/only-want-half-baked-cmake.patch  | 122 ------------------
 srcpkgs/cmake-bootstrap/template              |  10 +-
 3 files changed, 34 insertions(+), 125 deletions(-)
 create mode 100644 srcpkgs/cmake-bootstrap/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
 delete mode 100644 srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch

diff --git a/srcpkgs/cmake-bootstrap/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch b/srcpkgs/cmake-bootstrap/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
new file mode 100644
index 00000000000..44415f2990f
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
@@ -0,0 +1,27 @@
+From 9799af604ee6ba5461a5d879a694994fed3a72d2 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:17:05 -0600
+Subject: [PATCH] Fix undefined CMAKE_DOC_DIR
+
+---
+ Source/cmSystemTools.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 97440d2..f92060d 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -11,6 +11,10 @@
+ #  define _XOPEN_SOURCE 700
+ #endif
+ 
++#ifndef CMAKE_DOC_DIR
++#	define CMAKE_DOC_DIR /usr/share/doc
++#endif
++
+ #include "cmSystemTools.h"
+ 
+ #include <cmext/algorithm>
+-- 
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
deleted file mode 100644
index 07279cf6887..00000000000
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
---- Source/cmSystemTools.cxx
-+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- #ifdef CMAKE_BOOTSTRAP
-   // The bootstrap cmake does not provide the other tools,
-   // so use the directory where they are about to be built.
--  exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+  // this cmake will be installed to system directory
- #endif
-   cmSystemToolsCTestCommand =
-     cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
-     cmSystemToolsCMClDepsCommand.clear();
-   }
- 
--#ifndef CMAKE_BOOTSTRAP
-   // Install tree has
-   // - "<prefix><CMAKE_BIN_DIR>/cmake"
-   // - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
-       }
-     }
-   }
--#else
--  // Bootstrap build knows its source.
--  cmSystemToolsCMakeRoot = CMAKE_BOOTSTRAP_SOURCE_DIR;
--#endif
- }
- 
- std::string const& cmSystemTools::GetCMakeCommand()
-diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
---- bootstrap
-+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
-     echo "Test failed to produce executable"
-     return 2
-   fi
--  ./${TMPFILE}
--  RES=$?
--  rm -f "${TMPFILE}"
--  if test "${RES}" -ne "0"; then
--    echo "Test produced non-zero return code"
--    return 3
--  fi
--  echo "Test succeeded"
-   return 0
- }
- 
-@@ -839,13 +831,6 @@ cmake_try_make ()
-     echo "${COMPILER} does not produce output"
-     return 2
-   fi
--  ./test
--  RES=$?
--  rm -f "test"
--  if test "${RES}" -ne "0"; then
--    echo "${MAKE_PROC} produces strange executable"
--    return 3
--  fi
-   echo "${MAKE_PROC} works"
-   return 0
- }
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
- cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
- cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
- cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
--cmake_report cmConfigure.h${_tmp} "#define CMAKE_BIN_DIR \"/bootstrap-not-insalled\""
--cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insalled\""
-+cmake_report cmConfigure.h${_tmp} "#define CMAKE_BIN_DIR \"$cmake_bin_dir\""
-+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
- cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
- 
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
-   cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
- fi
- )
--
--echo "---------------------------------------------"
--
--# Run make to build bootstrap cmake
--if test "x${cmake_parallel_make}" != "x"; then
--  ${cmake_make_processor} ${cmake_make_flags}
--else
--  ${cmake_make_processor}
--fi
--RES=$?
--if test "${RES}" -ne "0"; then
--  cmake_error 9 "Problem while running ${cmake_make_processor}"
--fi
--cd "${cmake_binary_dir}"
--
--# Set C, CXX, and MAKE environment variables, so that real real cmake will be
--# build with same compiler and make
--CC="${cmake_c_compiler}"
--CXX="${cmake_cxx_compiler}"
--MAKE="${cmake_make_processor}"
--export CC
--export CXX
--export MAKE
--export CFLAGS
--export CXXFLAGS
--export LDFLAGS
--
--# Run bootstrap CMake to configure real CMake
--cmake_options="-DCMAKE_BOOTSTRAP=1"
--if test -n "${cmake_verbose}"; then
--  cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1"
--fi
--"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs} "$@"
--RES=$?
--if test "${RES}" -ne "0"; then
--  cmake_error 11 "Problem while running initial CMake"
--fi
--
--echo "---------------------------------------------"
--
--# And we are done. Now just run make
--echo "CMake has bootstrapped.  Now run ${cmake_make_processor}."
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..6163e9ca1c7 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-bootstrap'
 pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
 revision=1
 wrksrc=cmake-$version
 bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
  --system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
  --no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
  ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk cmake_doc_dir=/usr/share/doc"
 makedepends="libarchive-devel"
 short_desc="CMake (for bootstrapping only, not for normal usage)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
 conflicts="cmake>=0"
 
 CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
@@ -32,6 +32,10 @@ post_patch() {
 	rm -rf Utilities/cmnghttp2
 	rm -rf Utilities/cmzlib
 	rm -rf Utilities/cmzstd
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap
 }
 
 do_check() {

^ permalink raw reply	[flat|nested] 23+ messages in thread
end of thread, other threads:[~2020-11-21 15:20 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-21  0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
2020-11-21  0:30 ` [PR REVIEW] " sgn
2020-11-21  0:35 ` ndowens
2020-11-21  0:40 ` ndowens
2020-11-21  0:40 ` sgn
2020-11-21  0:42 ` ndowens
2020-11-21  0:57 ` [PR PATCH] [Updated] " ndowens
2020-11-21  0:59 ` ndowens
2020-11-21  1:08 ` ndowens
2020-11-21  1:14 ` ndowens
2020-11-21  3:20 ` [PR PATCH] [Updated] " ndowens
2020-11-21  4:04 ` ndowens
2020-11-21  4:47 ` ndowens
2020-11-21  5:01 ` ndowens
2020-11-21  5:30 ` ndowens
2020-11-21  5:38 ` [PR REVIEW] " sgn
2020-11-21  5:38 ` sgn
2020-11-21  9:34 ` [PR REVIEW] " ndowens
2020-11-21  9:34 ` ndowens
2020-11-21 10:07 ` [PR REVIEW] " sgn
2020-11-21 10:08 ` sgn
2020-11-21 10:08 ` sgn
2020-11-21 15:20 ` [PR PATCH] [Updated] " ndowens

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).