Date: Mon, 15 Sep 2014 15:35:19 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368270 - in head/devel/google-sparsehash: . files Message-ID: <201409151535.s8FFZJ3J051660@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Mon Sep 15 15:35:18 2014 New Revision: 368270 URL: http://svnweb.freebsd.org/changeset/ports/368270 QAT: https://qat.redports.org/buildarchive/r368270/ Log: Fixup templates and remove gcc dependency in this port. Side effect, allows compilation on armv6. PR: 193218 Submitted by: demon@FreeBSD.org Reviewed by: bdrewery (mentor) Approved by: maintainer timeout Added: head/devel/google-sparsehash/files/ head/devel/google-sparsehash/files/patch-src__sparsehash__internal__sparsehashtable.h (contents, props changed) Modified: head/devel/google-sparsehash/Makefile Modified: head/devel/google-sparsehash/Makefile ============================================================================== --- head/devel/google-sparsehash/Makefile Mon Sep 15 15:28:55 2014 (r368269) +++ head/devel/google-sparsehash/Makefile Mon Sep 15 15:35:18 2014 (r368270) @@ -3,7 +3,7 @@ PORTNAME= google-sparsehash PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_LOCAL} @@ -15,7 +15,7 @@ MAINTAINER= vd@FreeBSD.org COMMENT= Extremely memory-efficient hash_map implementation GNU_CONFIGURE= yes -USE_GCC= 4.8+ +USES= compiler:c++11-lang OPTIONS_DEFINE= DOCS Added: head/devel/google-sparsehash/files/patch-src__sparsehash__internal__sparsehashtable.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/google-sparsehash/files/patch-src__sparsehash__internal__sparsehashtable.h Mon Sep 15 15:35:18 2014 (r368270) @@ -0,0 +1,29 @@ +--- ./src/sparsehash/internal/sparsehashtable.h.orig 2014-09-13 09:25:42.349531861 -0700 ++++ ./src/sparsehash/internal/sparsehashtable.h 2014-09-13 09:27:25.632525344 -0700 +@@ -165,7 +165,7 @@ + public: + typedef sparse_hashtable_iterator<V,K,HF,ExK,SetK,EqK,A> iterator; + typedef sparse_hashtable_const_iterator<V,K,HF,ExK,SetK,EqK,A> const_iterator; +- typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,A>::nonempty_iterator ++ typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,value_alloc_type>::nonempty_iterator + st_iterator; + + typedef std::forward_iterator_tag iterator_category; // very little defined! +@@ -217,7 +217,7 @@ + public: + typedef sparse_hashtable_iterator<V,K,HF,ExK,SetK,EqK,A> iterator; + typedef sparse_hashtable_const_iterator<V,K,HF,ExK,SetK,EqK,A> const_iterator; +- typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,A>::const_nonempty_iterator ++ typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,value_alloc_type>::const_nonempty_iterator + st_iterator; + + typedef std::forward_iterator_tag iterator_category; // very little defined! +@@ -271,7 +271,7 @@ + + public: + typedef sparse_hashtable_destructive_iterator<V,K,HF,ExK,SetK,EqK,A> iterator; +- typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,A>::destructive_iterator ++ typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,value_alloc_type>::destructive_iterator + st_iterator; + + typedef std::forward_iterator_tag iterator_category; // very little defined!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409151535.s8FFZJ3J051660>