Eric Bavier <ericbav...@openmailbox.org> writes: > On 2016-09-09 10:10, ng0 wrote: >> Eric Bavier <ericbav...@openmailbox.org> writes: >> >>> The 2017 version also brings with it a change in license from GPLv2 >>> with >>> libstdc++ runtime exception to the ASL2.0. Could you include that in >>> this patch too? >>> >>> Thanks, >>> -- >>> `~Eric >>> >> >> This is what I used in the mislead "Add tbb" patch I've sent >> yesterday. It is now completely ASL2.0, or is it GPL2+ASL2.0? I've read >> it yesterday as ASL only. > > ASL only AFAICT. The www.threadbuildingblocks.org/licensing page says > GPLv2, but that may just be outdated. The tarball is ASL, which is what > we have to go with. > > -- > `~Eric >
Ok.
From a3708f40b760009c5128bd048d5cba1a63462909 Mon Sep 17 00:00:00 2001
From: ng0 <n...@we.make.ritual.n0.is>
Date: Thu, 8 Sep 2016 23:04:52 +0000
Subject: [PATCH] gnu: tbb: Update to 2017.
* gnu/packages/tbb.scm (tbb): Update to 2017.
---
gnu/packages/tbb.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index 0e9db72..c19391a 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rek...@elephly.net>
+;;; Copyright © 2016 ng0 <n...@we.make.ritual.n0.is>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -27,16 +28,16 @@
(define-public tbb
(package
(name "tbb")
- (version "4.3.2")
+ (version "2017")
(source (origin
(method url-fetch)
(uri (string-append
"https://www.threadingbuildingblocks.org/sites/default";
"/files/software_releases/source/"
- "tbb43_20141204oss_src.tgz"))
+ "tbb" version "_20160722oss_src.tgz"))
(sha256
(base32
- "0jsczl99jfgj47kj7c4sd4fk7v3rbaiax1ng9ypykz1hh0lrrsws"))
+ "038rmv3s8si51bjrzwyv8ldqw742fjjdfayi8pmjaq5zw32b8pzx"))
(modules '((guix build utils)))
(snippet
'(substitute* "build/common.inc"
@@ -85,6 +86,4 @@ the low-level threading details necessary for optimal multi-core performance.
It uses common C++ templates and coding style to eliminate tedious threading
implementation work. It provides parallel loop constructs, asynchronous
tasks, synchronization primitives, atomic operations, and more.")
- ;; GPLv2 with run-time exception:
- ;; <https://www.threadingbuildingblocks.org/licensing#runtime-exception>
- (license gpl2)))
+ (license asl2.0)))
--
2.10.0
-- ng0 For non-prism friendly talk find me on http://www.psyced.org
signature.asc
Description: PGP signature
