[PR PATCH] build-style/cmake: only look into masterdir libraries

[PR PATCH] build-style/cmake: only look into masterdir libraries

[sgn]

[-- 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 ;;

Re: [PR PATCH] [Updated] build-style/cmake: only look into masterdir libraries

[sgn]

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

There is an updated 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: 1406 bytes --]

From f7cc827d38912b4dadb7c5f45ec26b1011f38810 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..fbbb6a8d950 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 ;;

Re: build-style/cmake: only look into masterdir libraries

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26039#issuecomment-720082764

Comment:
Add John since John frequently touches cmake stuff

Re: build-style/cmake: only look into masterdir libraries

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/26039#issuecomment-720085487

Comment:
I'm not too acquainted with cmake thus I can only tell that to me it makes sense to not have `cmake-bootstrap` look at the host headers and libraries before the chroot is ready. At least I think this is what this PR does.

Re: build-style/cmake: only look into masterdir libraries

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/26039#issuecomment-720112748

Comment:
Only because I touch cmake stuff frequently, doesn't mean that I'm experienced in that mess. It looks fine on first glance, and since it is dependent on CHROOT_READY not being set, it won't break anything actively even if it is wrong (which it doesn't look like).

Re: build-style/cmake: only look into masterdir libraries

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26039#issuecomment-720145861

Comment:
i don't see this breaking anything, even potentially, considering `cmake-bootstrap` is used in exactly one case...

Re: [PR PATCH] [Merged]: build-style/cmake: only look into masterdir libraries

[q66]

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

There's a merged pull request on the void-packages repository

build-style/cmake: only look into masterdir libraries
https://github.com/void-linux/void-packages/pull/26039

Description:
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.