Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ccache: update to 4.0 (alternative approach for chroot-cmake)
@ 2020-10-20 15:10 sgn
  2020-10-20 15:16 ` [PR REVIEW] " pullmoll
                   ` (33 more replies)
  0 siblings, 34 replies; 35+ messages in thread
From: sgn @ 2020-10-20 15:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages chroot-cmake-and-ccache
https://github.com/void-linux/void-packages/pull/25753

ccache: update to 4.0 (alternative approach for chroot-cmake)
Alternative for https://github.com/void-linux/void-packages/pull/25724

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

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

From 2685abae1ffae3da8d59716a27a5eadb086b756e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/3] ccache: update to 4.0

This release changes from using autoconf to cmake.
---
 srcpkgs/ccache/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..8cab61f8740 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,10 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=3.7.12
+version=4.0
 revision=1
 bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
 checkdepends="perl"
 short_desc="Fast C/C++ Compiler Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +12,11 @@ license="GPL-3.0-or-later"
 homepage="https://ccache.samba.org/"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="chroot-cmake"
+fi
 
 post_install() {
 	vmkdir usr/lib/ccache/bin

From 27eb4fea240d2d25103df03169504697b56f9f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:35:22 +0200
Subject: [PATCH 2/3] build-style cmake: depend only if $CHROOT_READY

---
 common/environment/build-style/cmake.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 41f758a69a6..8347814c616 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1 +1,5 @@
-hostmakedepends+=" cmake"
+if [ "$CHROOT_READY" ]; then
+	if [[ "$hostmakedepends" != *"chroot-cmake"* ]]; then
+		hostmakedepends+=" cmake"
+	fi
+fi

From ae699ed67a8ccf5954a740d98ec8025e90abefef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 20 Oct 2020 21:32:03 +0700
Subject: [PATCH 3/3] New package: chroot-cmake-3.18.2

---
 .../patches/only-want-half-baked-cmake.patch  | 122 ++++++++++++++++++
 srcpkgs/chroot-cmake/template                 |  53 ++++++++
 srcpkgs/chroot-cmake/update                   |   1 +
 3 files changed, 176 insertions(+)
 create mode 100644 srcpkgs/chroot-cmake/patches/only-want-half-baked-cmake.patch
 create mode 100644 srcpkgs/chroot-cmake/template
 create mode 100644 srcpkgs/chroot-cmake/update

diff --git a/srcpkgs/chroot-cmake/patches/only-want-half-baked-cmake.patch b/srcpkgs/chroot-cmake/patches/only-want-half-baked-cmake.patch
new file mode 100644
index 00000000000..1074b068c8d
--- /dev/null
+++ b/srcpkgs/chroot-cmake/patches/only-want-half-baked-cmake.patch
@@ -0,0 +1,122 @@
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 1e78d36..0713bab 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";
++  exe_dir = "/usr/bin";
+ #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/chroot-cmake/template b/srcpkgs/chroot-cmake/template
new file mode 100644
index 00000000000..f457de28902
--- /dev/null
+++ b/srcpkgs/chroot-cmake/template
@@ -0,0 +1,53 @@
+# Template file for 'chroot-cmake'
+pkgname=chroot-cmake
+version=3.18.2
+revision=1
+wrksrc=cmake-$version
+bootstrap=yes
+build_style=configure
+configure_args="--prefix=/usr --datadir=share/chroot-cmake --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"
+makedepends="libarchive-devel"
+short_desc="Cross MAKE (bootstrapping version for chroot)"
+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
+provides="cmake-0_1"
+replaces="cmake>=0"
+
+CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
+CXXFLAGS="$CFLAGS"
+
+post_patch() {
+	rm -rf Utilities/cmbzip2
+	rm -rf Utilities/cmcurl
+	rm -rf Utilities/cmexpat
+	# rm -rf Utilities/cmjsoncpp
+	rm -rf Utilities/cmlibarchive
+	rm -rf Utilities/cmliblzma
+	rm -rf Utilities/cmlibrhash
+	rm -rf Utilities/cmnghttp2
+	rm -rf Utilities/cmzlib
+	rm -rf Utilities/cmzstd
+}
+
+do_check() {
+	: "real cmake is never built"
+}
+
+do_install() {
+	vbin Bootstrap.cmk/cmake
+	vmkdir usr/share/chroot-cmake
+	vcopy Modules usr/share/chroot-cmake
+	vcopy Templates usr/share/chroot-cmake
+
+	vlicense Copyright.txt
+	vlicense Utilities/KWIML/Copyright.txt  KWIML-Copyright.txt
+	vlicense Utilities/cmlibuv/LICENSE      libuv-LICENSE
+	vlicense Utilities/cmjsoncpp/LICENSE    jsoncpp-LICENSE
+}
diff --git a/srcpkgs/chroot-cmake/update b/srcpkgs/chroot-cmake/update
new file mode 100644
index 00000000000..4671bfbb185
--- /dev/null
+++ b/srcpkgs/chroot-cmake/update
@@ -0,0 +1 @@
+site='https://cmake.org/download/'

^ permalink raw reply	[flat|nested] 35+ messages in thread
end of thread, other threads:[~2020-11-01  0:55 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-20 15:10 [PR PATCH] ccache: update to 4.0 (alternative approach for chroot-cmake) sgn
2020-10-20 15:16 ` [PR REVIEW] " pullmoll
2020-10-20 15:18 ` pullmoll
2020-10-20 15:21 ` [PR PATCH] [Updated] " sgn
2020-10-20 15:23 ` [PR REVIEW] " sgn
2020-10-20 15:29 ` pullmoll
2020-10-20 15:36 ` sgn
2020-10-20 16:17 ` pullmoll
2020-10-20 16:18 ` pullmoll
2020-10-20 23:43 ` [PR PATCH] [Updated] " sgn
2020-10-20 23:43 ` [PR REVIEW] " sgn
2020-10-20 23:52 ` [PR PATCH] [Updated] " sgn
2020-10-20 23:58 ` [PR REVIEW] " sgn
2020-10-21  0:57 ` pullmoll
2020-10-21  0:59 ` pullmoll
2020-10-21  1:11 ` pullmoll
2020-10-21  1:24 ` [PR REVIEW] " q66
2020-10-21  2:26 ` pullmoll
2020-10-21 11:16 ` [PR PATCH] [Updated] " sgn
2020-10-21 14:18 ` [PR REVIEW] " sgn
2020-10-21 14:18 ` sgn
2020-10-21 14:42 ` pullmoll
2020-10-21 15:13 ` sgn
2020-10-21 15:14 ` sgn
2020-10-21 18:35 ` [PR REVIEW] " ericonr
2020-10-21 18:35 ` ericonr
2020-10-21 22:51 ` sgn
2020-10-21 22:55 ` sgn
2020-10-21 22:58 ` [PR PATCH] [Updated] " sgn
2020-10-22 11:00 ` sgn
2020-10-22 14:07 ` sgn
2020-10-23  9:51 ` [PR PATCH] [Merged]: " pullmoll
2020-11-01  0:33 ` Piraty
2020-11-01  0:34 ` Piraty
2020-11-01  0:55 ` sgn

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).