From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4F9aAYcv+2DqjwAAgWs5BA (envelope-from ) for ; Fri, 23 Jul 2021 23:07:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id GBB3OIYv+2CceQAA1q6Kng (envelope-from ) for ; Fri, 23 Jul 2021 21:07:18 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CD939EF96 for ; Fri, 23 Jul 2021 23:07:17 +0200 (CEST) Received: from localhost ([::1]:37436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m72O4-0003qc-TS for larch@yhetil.org; Fri, 23 Jul 2021 17:07:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m72Nq-0003pG-K0 for guix-patches@gnu.org; Fri, 23 Jul 2021 17:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33199) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m72Nq-0005NM-Cp for guix-patches@gnu.org; Fri, 23 Jul 2021 17:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m72Nq-0002HT-4w for guix-patches@gnu.org; Fri, 23 Jul 2021 17:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 1/3] gnu: cereal: Use cmake to build and install the library. Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jul 2021 21:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16270743698699 (code B ref -1); Fri, 23 Jul 2021 21:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jul 2021 21:06:09 +0000 Received: from localhost ([127.0.0.1]:44745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72Mz-0002GF-Ci for submit@debbugs.gnu.org; Fri, 23 Jul 2021 17:06:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:51690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72Mu-0002G3-Hz for submit@debbugs.gnu.org; Fri, 23 Jul 2021 17:06:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m72Mu-0002qQ-D9 for guix-patches@gnu.org; Fri, 23 Jul 2021 17:06:04 -0400 Received: from mail.spbu.ru ([195.70.197.23]:53875 helo=cgp2.pu.ru) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1m72Mq-0004Ce-Hs for guix-patches@gnu.org; Fri, 23 Jul 2021 17:06:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=l7PEzWKWn7BXxNOeU4ElVYGq6UzXh8FvAxV2yU4/yK0=; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From; b=qrlZdxiXCwUDdRGCVJHvzVaJjMnsqQmRz9mPNNDtm0EQc79lqf7gT+Oy1uiCmWlGAfdnRT4zNc qOS9L4S/+/adIiPIhtuX/vtMw87q3YM1bLjD9n7ceI0wazS1fkgSykt3uQXHZ+gXBtaEoMJ73mAVT Gl5XI7Oitf+eWMeuJgdG6gPP/PAX+P2SKsyNPrPF4HlujskJW0vO/3EG/D9Ru0vOwvevv7/HaqxwC fuOKkKU0z+NoVTDvmR3RJTva4DTT1KmcZdUwYehryuy/ddbvuy8UK82Bpndd4d5mx1gk25qTmJeEs Aa61bQ+ljfeCnkzhSCBgA50kdu1/lZmD+66YA== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 173785486; Sat, 24 Jul 2021 00:05:22 +0300 From: Ivan Gankevich Date: Sat, 24 Jul 2021 00:00:39 +0300 Message-Id: <20210723210037.28150-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=195.70.197.23; envelope-from=i.gankevich@spbu.ru; helo=cgp2.pu.ru X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627074438; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=JVrSAItrcu/99WPzRAAS+tkNZGLIdqpnpl3QPQcyFH4=; b=FK+38E48r1AmFUd4nfeQXQk3vmYG+mMhlRzFKEF6DLwjKsNjxYB8XglAGYpQly4MJl/w6M 10lm10UsYQjYyiLTGdIvV4ztIE0TfI2bIS1B5y89YXd52G5aKp9W4QEi6af3bwvQKnpPHP U/KMr+oMPmvyrxcnUmaZ3/sZmL9IFRlDbBsyqZ25LTR8TEW9GJ0u7JGiOJ3exJKr+rZwe2 Rf59DCHRE+suR5M2A5gvyE6CxAYXojE9sbEODhwn86ftcH+Vv/Sw4f8/dyN6ROYHTDT9Wc Hd9o4GTYaG+6gpGTqXVk0TSnLiUdXE6jDjazDdmHp64Gqok9TbVnphkIu6iQ5A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627074438; a=rsa-sha256; cv=none; b=kLDk2KHfPNdEdjPX20Bo98XGu0ADTIMf/S4m48X0eT2T3ueauirpYiCQcdFxfrn4zh/VeC nVY1EgkJ2okIEd1uve7aV3Qk23YlkFM8kr8Mj/5VmXNcGYRCYEEWzp8mNg2A4jBEqRyzCa Ylc4GD9PbK14rqNQbGXB+STx+VRt89g9gQhjwgnd0ryZsycPLwWF3iJknNECchVow+L9YG BY78/BwZV7WoDaKUtnhS+UDVFl803aTUU0qTZkE84a8Obvg7xEh/P0ZEiYj5NkYUD70bzD RwzocnHaZuSafQzL0lYEhGBxLWbAazmMY5Ol4NZaFWA3jvqqWYXDNFo9UqTi+A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spbu.ru header.s=20180812 header.b=qrlZdxiX; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.58 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spbu.ru header.s=20180812 header.b=qrlZdxiX; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: CD939EF96 X-Spam-Score: 3.58 X-Migadu-Scanner: scn0.migadu.com X-TUID: SshNI+SGZy6w Hello, this series of patches adds Prusa Slicer. I had to change "cereal" package definition to use cmake, otherwise "prusa-slicer" failed to find the library. Also, I added "libigl" that is a dependency of "prusa-slicer". gnu/packages/serialization.scm (cereal): Use cmake. * Replace manual build and installation with standard cmake. The main reason to do that is to get "cereal-config.cmake" file that is used to find the library in other projects. --- gnu/packages/serialization.scm | 39 ++++++++++++---------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 8f292ae408..9c34da62af 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -141,32 +141,19 @@ implement RPC protocols.") "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")))) (build-system cmake-build-system) (arguments - `(;; The only included tests are portability tests requiring - ;; cross-compilation and boost. Since we are building cereal on more - ;; platforms anyway, there is no compelling reason to build the tests. - #:tests? #f - #:out-of-source? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (substitute* "doc/doxygen.in" - (("@CMAKE_CURRENT_BINARY_DIR@") ".") - (("@CMAKE_CURRENT_SOURCE_DIR@") ".")) - (with-directory-excursion "doc" - (invoke "doxygen" "doxygen.in")))) - ;; There is no "install" target, so we have to provide our own - ;; "install" phase. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/cereal/docs")) - (include (string-append out "/include/cereal"))) - (mkdir-p doc) - (mkdir-p include) - (copy-recursively "include/cereal" include) - (copy-recursively "doc/html" doc))))))) + `(#:configure-flags (list "-DSKIP_PORTABILITY_TEST=ON") + #:tests? #f + #:phases (modify-phases %standard-phases + (add-before 'configure 'skip-sandbox + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(sandbox\\)") "")))) + (add-after 'install 'install-doc + (lambda _ + (let ((doc (string-append %output "/share/doc/html"))) + (invoke "make" "doc") + (mkdir-p doc) + (copy-recursively "doc/html" doc))))))) (native-inputs `(("doxygen" ,doxygen))) (home-page "https://uscilab.github.io/cereal/") -- 2.32.0