Date: Tue, 16 Dec 2008 18:16:25 GMT From: Ganael Laplanche <ganael.laplanche@martymac.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/129686: Port update: devel/tbb - Update to v2.1 Message-ID: <200812161816.mBGIGPIA032729@www.freebsd.org> Resent-Message-ID: <200812161820.mBGIK1qj093692@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129686 >Category: ports >Synopsis: Port update: devel/tbb - Update to v2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Dec 16 18:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Ganael Laplanche >Release: 8.0-CURRENT >Organization: http://contribs.martymac.com >Environment: FreeBSD home.martymac.com 8.0-CURRENT FreeBSD 8.0-CURRENT #27: Thu Dec 4 14:58:40 CET 2008 root@home.martymac.com:/usr/obj/usr/src/sys/MYKERNEL amd64 >Description: This patch updates devel/tbb to version 2.1 (20080605). Changes to the port : - Includes a script to generate version info string for freeBSD - Use ${COPYTREE_SHARE} to install headers - Use ${PTHREAD_LIBS} instead of -lpthread >How-To-Repeat: >Fix: Patch attached with submission follows: diff -aurN tbb.orig/Makefile tbb/Makefile --- tbb.orig/Makefile 2008-02-23 20:44:22.000000000 +0100 +++ tbb/Makefile 2008-12-16 11:27:57.000000000 +0100 @@ -6,30 +6,36 @@ # PORTNAME= tbb -PORTVERSION= 2.0 +PORTVERSION= 2.1 CATEGORIES= devel -MASTER_SITES= http://threadingbuildingblocks.org/uploads/76/95/2.0/ -DISTNAME= tbb20_20080207oss_src +MASTER_SITES= http://www.threadingbuildingblocks.org/uploads/77/111/2.1/ +DISTNAME= tbb21_20080605oss_src +EXTRACT_SUFX= .tgz MAINTAINER= arun@FreeBSD.org COMMENT= A library that provides thread building blocks -PATCH_STRIP= -p1 - ONLY_FOR_ARCHS= amd64 i386 ia64 ONLY_FOR_ARCHS_REASON= has not been ported to this platform USE_LDCONFIG= yes USE_GMAKE= yes ALL_TARGET= default +WRKSRC= ${WRKDIR}/tbb21_20080605oss + +post-extract: + @${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/ + +post-patch: + @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/build/FreeBSD.gcc.inc + do-install: cd ${WRKSRC}; \ ${INSTALL_DATA} build/FreeBSD*release/libtbb.so \ ${PREFIX}/lib/libtbb.so; \ ${INSTALL_DATA} build/FreeBSD*release/libtbbmalloc.so \ ${PREFIX}/lib/libtbbmalloc.so; \ - ${MKDIR} ${PREFIX}/include/tbb/machine; \ - ${FIND} include -type f -name '*.h' -exec \ - ${INSTALL_DATA} \{\} ${PREFIX}/\{\} \; + ${MKDIR} ${PREFIX}/include/tbb/; \ + cd include/tbb/ && ${COPYTREE_SHARE} \* ${PREFIX}/include/tbb/ .include <bsd.port.mk> diff -aurN tbb.orig/distinfo tbb/distinfo --- tbb.orig/distinfo 2008-02-23 20:44:22.000000000 +0100 +++ tbb/distinfo 2008-12-16 08:45:30.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (tbb20_20080207oss_src.tar.gz) = c5109c27f54ba758550561feea9e255d -SHA256 (tbb20_20080207oss_src.tar.gz) = b2a7f3e3f44f4a2461c78aca9e92591f5158f5304b114c5a6cd4b4b395fc9b75 -SIZE (tbb20_20080207oss_src.tar.gz) = 830100 +MD5 (tbb21_20080605oss_src.tgz) = 6accb7e86dff355cd8cfbc9de1225c8d +SHA256 (tbb21_20080605oss_src.tgz) = c326c9f718d3fe45bd678e6cee4bafbf5194b1483e0f5697993060e4b6586927 +SIZE (tbb21_20080605oss_src.tgz) = 1107680 diff -aurN tbb.orig/files/patch-build-FreeBSD.inc tbb/files/patch-build-FreeBSD.inc --- tbb.orig/files/patch-build-FreeBSD.inc 1970-01-01 01:00:00.000000000 +0100 +++ tbb/files/patch-build-FreeBSD.inc 2008-12-16 09:32:46.000000000 +0100 @@ -0,0 +1,11 @@ +--- build/FreeBSD.inc.orig 2008-06-07 08:56:22.000000000 +0200 ++++ build/FreeBSD.inc 2008-12-16 09:32:21.710673762 +0100 +@@ -54,7 +54,7 @@ + MD?=mkdir -p + NUL= /dev/null + SLASH=/ +-MAKE_VERSIONS=sh $(tbb_root)/build/version_info_linux.sh $(CPLUS) $(CPLUS_FLAGS) $(INCLUDES) >version_string.tmp ++MAKE_VERSIONS=sh $(tbb_root)/build/version_info_FreeBSD.sh $(CPLUS) $(CPLUS_FLAGS) $(INCLUDES) >version_string.tmp + MAKE_TBBVARS=sh $(tbb_root)/build/generate_tbbvars.sh + + ifdef LD_LIBRARY_PATH diff -aurN tbb.orig/files/version_info_FreeBSD.sh tbb/files/version_info_FreeBSD.sh --- tbb.orig/files/version_info_FreeBSD.sh 1970-01-01 01:00:00.000000000 +0100 +++ tbb/files/version_info_FreeBSD.sh 2008-12-16 09:30:11.000000000 +0100 @@ -0,0 +1,15 @@ +#!/bin/sh + +# Script used to generate version info string +echo "#define __TBB_VERSION_STRINGS \\" +echo '"TBB:' "BUILD_HOST\t\t"`hostname -s`" ("`uname -p`")"'" ENDL \' +echo '"TBB:' "BUILD_OS\t\t"`uname -sr`'" ENDL \' +echo '"TBB:' "BUILD_KERNEL\t"`uname -rv`'" ENDL \' +echo '"TBB:' "BUILD_GCC\t\t"`g++ -v </dev/null 2>&1 | grep 'gcc.*version'`'" ENDL \' +[ -z "$COMPILER_VERSION" ] || echo '"TBB:' "BUILD_COMPILER\t"$COMPILER_VERSION'" ENDL \' +echo '"TBB:' "BUILD_GLIBC\t"`ldconfig -r | grep -oE '/lib/libc.so.[0-9]+' | sort -rn | head -n 1 | sed 's|/lib/libc\.so\.||'`'" ENDL \' +echo '"TBB:' "BUILD_LD\t\t"`ld -v | grep 'version'`'" ENDL \' +echo '"TBB:' "BUILD_TARGET\t$arch on $runtime"'" ENDL \' +echo '"TBB:' "BUILD_COMMAND\t"$*'" ENDL \' +echo "" +echo "#define __TBB_DATETIME \""`date -u`"\"" diff -aurN tbb.orig/pkg-plist tbb/pkg-plist --- tbb.orig/pkg-plist 2008-02-23 20:44:22.000000000 +0100 +++ tbb/pkg-plist 2008-12-16 10:44:23.000000000 +0100 @@ -36,7 +36,11 @@ include/tbb/tick_count.h include/tbb/_tbb_windef.h include/tbb/partitioner.h +include/tbb/task_scheduler_observer.h +include/tbb/tbb_allocator.h +include/tbb/tbb_exception.h include/tbb/tbb_machine.h +include/tbb/tbb_thread.h lib/libtbb.so lib/libtbbmalloc.so @dirrm include/tbb/machine >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812161816.mBGIGPIA032729>