From patchwork Mon Aug 8 15:45:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vicvbcun X-Patchwork-Id: 41394 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3084C27BBEA; Mon, 8 Aug 2022 16:50:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7212C27BBE9 for ; Mon, 8 Aug 2022 16:50:04 +0100 (BST) Received: from localhost ([::1]:51670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oL511-0002tk-JZ for patchwork@mira.cbaines.net; Mon, 08 Aug 2022 11:50:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL4zA-0000NU-Hn for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oL4zA-0006nC-7m for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oL4zA-00069V-3Z for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56729] [RFC PATCH v2 20/29] gnu: Add tachyon. Resent-From: vicvbcun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Aug 2022 15:48:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56729@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Andreas Enge Received: via spool by 56729-submit@debbugs.gnu.org id=B56729.165997365623302 (code B ref 56729); Mon, 08 Aug 2022 15:48:08 +0000 Received: (at 56729) by debbugs.gnu.org; 8 Aug 2022 15:47:36 +0000 Received: from localhost ([127.0.0.1]:41711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4yc-00063B-NU for submit@debbugs.gnu.org; Mon, 08 Aug 2022 11:47:36 -0400 Received: from mo4-p05-ob.smtp.rzone.de ([85.215.255.134]:41577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4yQ-00060M-Cm for 56729@debbugs.gnu.org; Mon, 08 Aug 2022 11:47:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1659973639; s=strato-dkim-0002; d=ikherbers.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=xg5/LMZGSrSlQTvCJgtULksPLZOcTydR3hZHU0xyOdM=; b=nMxXcMXr07/NGg+B6cdDIm4MQ/c7FHWXLcxnK4JPmugPiZZAmKPEeLUXh5l/wuODM8 IjdSyg4iOv8FczlZw8yPFS7EyD99SiiigbiJBySaE8tMKzeqhIv6r5txsAq88puHoFBj ip5Nvft/dnCBcV++TLMi+qJVVJI++8x82OxGYl+D8CjBrjEc5WS1vVA3twAoGmFrG+VN 2ex88IibGZg5MZf6svTMvsJPZMeRz4XHAN6ucMukEP7sK/mK6OYb4w0CWEYqiA8HNTY5 vRQdSmrJ0V/40eFWPZp+So5VQWt5QUFSOfjW4X2C1YyDfT2bs5n7zke3QuBcjUAGRaMR OkaA== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":IUwNfkitaf3qOWm2b/jA5tveVwUUcwH3PkiYp6DPxTDDEo4xO9ymAEzKSWlvmNAhIG6s" X-RZG-CLASS-ID: mo05 Received: from lambda.localdomain by smtp.strato.de (RZmta 47.47.0 DYNA|AUTH) with ESMTPSA id 0cac6cy78FlJoRb (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 8 Aug 2022 17:47:19 +0200 (CEST) From: vicvbcun Date: Mon, 8 Aug 2022 17:45:55 +0200 Message-Id: X-Mailer: git-send-email 2.37.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sagemath.scm (tachyon): New variable. * gnu/packages/patches/tachyon-make-arch.patch: New file. * gnu/local.mk (dist_patch_DATA): Add here. --- gnu/local.mk | 1 + gnu/packages/patches/tachyon-make-arch.patch | 13 ++++++ gnu/packages/sagemath.scm | 48 ++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 gnu/packages/patches/tachyon-make-arch.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3877d1aeb3..aa38f66066 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1832,6 +1832,7 @@ dist_patch_DATA = \ %D%/packages/patches/t1lib-CVE-2011-0764.patch \ %D%/packages/patches/t1lib-CVE-2011-1552+.patch \ %D%/packages/patches/t4k-common-libpng16.patch \ + %D%/packages/patches/tachyon-make-arch.patch \ %D%/packages/patches/tao-add-missing-headers.patch \ %D%/packages/patches/tao-fix-parser-types.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \ diff --git a/gnu/packages/patches/tachyon-make-arch.patch b/gnu/packages/patches/tachyon-make-arch.patch new file mode 100644 index 0000000000..4e721092a7 --- /dev/null +++ b/gnu/packages/patches/tachyon-make-arch.patch @@ -0,0 +1,13 @@ +--- a/unix/Make-arch 2022-08-07 22:05:30.738754355 +0200 ++++ b/unix/Make-arch 2022-08-07 22:31:59.969229824 +0200 +@@ -1453,9 +1453,6 @@ + # Linux x86 using gcc, with threads + linux-thr: + $(MAKE) all \ +- "ARCH = linux-thr" \ +- "CC = cc" \ + "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS)" \ +- "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ + "RANLIB = ranlib" \ \ No newline at end of file diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index b59c93f13a..4ffc3fb9ba 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -547,3 +547,51 @@ (define-public flintqs factorization") (description synopsis) (license license:gpl2))) + +(define-public tachyon + (package + (name "tachyon") + (version "0.99.5") + (source (origin + (method url-fetch) + (uri (string-append + "http://jedi.ks.uiuc.edu/~johns/raytracer/files/" version + "/tachyon-" version ".tar.gz")) + (sha256 + (base32 + "1xd6h5d4v6dsnm6w46bdcr15fwkcz44p8dncymfry50i4c83q809")) + (patches (search-patches "tachyon-make-arch.patch")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ; no tests + #:make-flags #~(list "linux-thr" + (string-append "CC=" #$(cc-for-target)) + (string-append "AR=" #$(ar-for-target))) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'cd-to-src + (lambda _ + (chdir "unix"))) + (add-before 'build 'enable-png-jpeg-support + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Make-config" + (("USEJPEG=") "USEJPEG = -DUSEJPEG") + (("JPEGLIB=") "JPEGLIB = -ljpeg") + (("USEPNG=") "USEPNG = -DUSEPNG") + (("PNGLIB=") "PNGLIB = -lpng -lz")))) + (add-before 'build 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Make-config" + (("SHELL=/bin/sh") + (string-append "SHELL=" (search-input-file inputs "/bin/sh")))))) + (replace 'install + (lambda _ + (install-file "../compile/tachyon" + (string-append #$output "/bin")) + (install-file "../compile/libtachyon.a" + (string-append #$output "/lib"))))))) + (inputs (list libjpeg-turbo libpng)) + (home-page "http://jedi.ks.uiuc.edu/~johns/raytracer/") + (synopsis "Multithreaded ray tracing software") + (description synopsis) + (license license:bsd-3)))