Attachment 157771 Details for Bug 200887 – Proposed patch

[patch] Proposed patch

tbb.diff (text/plain), 3.03 KB, created by Xin LI on 2015-06-15 21:54:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2015-06-15 21:54:25 UTC

Size: 3.03 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 389756)
>+++ Makefile	(working copy)
>@@ -3,11 +3,11 @@
> 
> PORTNAME=	tbb
> PORTVERSION=	4.3.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \
> 		LOCAL/martymac
>-DISTNAME=	${PORTNAME}${PORTVERSION:R:S/.//g}_20140724oss_src
>+DISTNAME=	${PORTNAME}${PORTVERSION:R:S/.//g}_20150611oss_src
> 
> MAINTAINER=	martymac@FreeBSD.org
> COMMENT=	Library that provides thread building blocks
>Index: distinfo
>===================================================================
>--- distinfo	(revision 389756)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (tbb43_20140724oss_src.tgz) = fc15e84befe1acadad3589e7f2a461443bef77cc699038875ef2692e1ceb0bb4
>-SIZE (tbb43_20140724oss_src.tgz) = 2790795
>+SHA256 (tbb43_20150611oss_src.tgz) = 221f85fe64e11c9638e43b3c57d5750c26683905fc90827c0bcfefdb286e79c9
>+SIZE (tbb43_20150611oss_src.tgz) = 2757631
>Index: files/patch-build-FreeBSD.inc
>===================================================================
>--- files/patch-build-FreeBSD.inc	(revision 389756)
>+++ files/patch-build-FreeBSD.inc	(working copy)
>@@ -1,11 +1,11 @@
>---- build/FreeBSD.inc.orig	2012-09-03 13:10:45.423760088 -0400
>-+++ build/FreeBSD.inc	2012-09-03 13:13:15.765760027 -0400
>-@@ -37,14 +37,14 @@
>+--- build/FreeBSD.inc.orig	2015-06-11 14:18:55 UTC
>++++ build/FreeBSD.inc
>+@@ -29,14 +29,14 @@ ifndef arch
>  endif
>  
>  ifndef runtime
>--        gcc_version:=$(shell gcc -v 2>&1 | grep 'gcc version' | sed -e 's/^gcc version //' | sed -e 's/ .*$$//')
>-+        gcc_version:=$(shell $(CC) -v 2>&1 | grep ' version' | sed -e 's/^.* version //' | sed -e 's/ .*$$//')
>+-        gcc_version:=$(shell gcc -dumpversion)
>++        gcc_version:=$(shell $(CC) -dumpversion)
>          os_version:=$(shell uname -r)
>          os_kernel_version:=$(shell uname -r | sed -e 's/-.*$$//')
>          export runtime:=cc$(gcc_version)_kernel$(os_kernel_version)
>@@ -13,12 +13,12 @@
>  
> -native_compiler := gcc
> -export compiler ?= gcc
>-+native_compiler := $(CC) 
>++native_compiler := $(CC)
> +export compiler ?= $(CC)
>  debugger ?= gdb
>  
>  CMD=$(SHELL) -c
>-@@ -54,7 +54,7 @@
>+@@ -46,7 +46,7 @@ RD?=rmdir
>  MD?=mkdir -p
>  NUL= /dev/null
>  SLASH=/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 389756)
>+++ pkg-plist	(working copy)
>@@ -20,6 +20,7 @@ include/tbb/concurrent_vector.h
> include/tbb/critical_section.h
> include/tbb/enumerable_thread_specific.h
> include/tbb/flow_graph.h
>+include/tbb/global_control.h
> include/tbb/index.html
> include/tbb/internal/_aggregator_impl.h
> include/tbb/internal/_concurrent_queue_impl.h
>@@ -36,6 +37,7 @@ include/tbb/internal/_mutex_padding.h
> include/tbb/internal/_range_iterator.h
> include/tbb/internal/_tbb_strings.h
> include/tbb/internal/_tbb_windef.h
>+include/tbb/internal/_template_helpers.h
> include/tbb/internal/_x86_eliding_mutex_impl.h
> include/tbb/internal/_x86_rtm_rw_mutex_impl.h
> include/tbb/machine/gcc_armv7.h

Actions: View | Diff

Attachments on bug 200887: 157771