From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] build-style/cmake: only look into masterdir libraries
Date: Sun, 01 Nov 2020 13:39:49 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26039@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages bootstrap-cmake-build-style
https://github.com/void-linux/void-packages/pull/26039
build-style/cmake: only look into masterdir libraries
As of it's now, cmake will look into host's libraries, thus
bootstrapping will fail at ccache if host system doesn't have
libzstd-devel installed.
A patch file from https://github.com/void-linux/void-packages/pull/26039.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-cmake-build-style-26039.patch --]
[-- Type: text/x-diff, Size: 1407 bytes --]
From 7410f6f1acb9555b253c9154be446ef918bf11ba 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: Sun, 1 Nov 2020 19:37:41 +0700
Subject: [PATCH] build-style/cmake: only look into masterdir libraries
As of it's now, cmake will look into host's libraries, thus
bootstrapping will fail at ccache if host system doesn't have
libzstd-devel installed.
---
common/build-style/cmake.sh | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index ef0715ef2e4..0894f20614d 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -6,7 +6,21 @@ do_configure() {
[ ! -d ${cmake_builddir:=build} ] && mkdir -p ${cmake_builddir}
cd ${cmake_builddir}
- if [ "$CROSS_BUILD" ]; then
+ if [ -z "$CHROOT_READY" ]; then
+ cat >bootstrap.cmake <<-_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+
+SET(CMAKE_FIND_ROOT_PATH ${XBPS_MASTERDIR})
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+ configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
+ elif [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
next reply other threads:[~2020-11-01 12:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-01 12:39 sgn [this message]
2020-11-01 12:41 ` [PR PATCH] [Updated] " sgn
2020-11-01 12:45 ` sgn
2020-11-01 13:09 ` pullmoll
2020-11-01 16:16 ` Johnnynator
2020-11-01 20:22 ` q66
2020-11-01 20:22 ` [PR PATCH] [Merged]: " q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26039@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).