From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:55064) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5UuG-000260-F0 for guix-patches@gnu.org; Wed, 04 Sep 2019 09:01:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5UuE-0008KZ-T9 for guix-patches@gnu.org; Wed, 04 Sep 2019 09:01:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52199) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5UuE-0008K9-Fh for guix-patches@gnu.org; Wed, 04 Sep 2019 09:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i5UuE-0005XS-8g for guix-patches@gnu.org; Wed, 04 Sep 2019 09:01:02 -0400 Subject: [bug#36477] [PATCH v3 04/48] gnu: cmake: Fix cross-compilation. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20190902153333.11190-1-m.othacehe@gmail.com> <20190902153333.11190-5-m.othacehe@gmail.com> Date: Wed, 04 Sep 2019 15:00:51 +0200 In-Reply-To: <20190902153333.11190-5-m.othacehe@gmail.com> (Mathieu Othacehe's message of "Mon, 2 Sep 2019 17:32:49 +0200") Message-ID: <87d0gg2p30.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Mathieu Othacehe Cc: 36477@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mathieu Othacehe skribis: > * gnu/packages/cmake.scm (cmake-minimal-cross): New package. > * guix/build-system/cmake.scm (default-cmake): Add new target argument an= d use > it to select cmake-minimal or cmake-minimal-cross. > (lower): Pass target to default-cmake. > --- > gnu/packages/cmake.scm | 8 ++++++++ > guix/build-system/cmake.scm | 9 ++++++--- > 2 files changed, 14 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm > index 1d8d829ec5..9bf0273f00 100644 > --- a/gnu/packages/cmake.scm > +++ b/gnu/packages/cmake.scm > @@ -207,6 +207,14 @@ and workspaces that can be used in the compiler envi= ronment of your choice.") > (outputs '("out" "doc")) > (properties (alist-delete 'hidden? (package-properties cmake-minimal= ))))) >=20=20 > +(define-public cmake-minimal-cross > + (package > + (inherit cmake-minimal) > + (name "cmake-minimal-cross") > + (native-search-paths '()) > + (search-paths > + (package-native-search-paths cmake-minimal)))) It seems to be enough to just add =E2=80=98search-paths=E2=80=99 to =E2=80= =98cmake=E2=80=99: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 7186cf98df..9f517238a0 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -151,6 +151,7 @@ (list (search-path-specification (variable "CMAKE_PREFIX_PATH") (files '(""))))) + (search-paths native-search-paths) (home-page "https://cmake.org/") (synopsis "Cross-platform build system") (description --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable =E2=80=A6 and it doesn=E2=80=99t trigger a full rebuild. Please push that to =E2=80=98master=E2=80=99 if it works for you! Ludo=E2=80=99. --=-=-=--