diff options
| author | sbruno <sbruno@FreeBSD.org> | 2014-09-15 23:35:18 +0800 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2014-09-15 23:35:18 +0800 |
| commit | f04afbc79b715c97cf48c3a24097f447fa8f8d3a (patch) | |
| tree | 6de96e175edac96d795e97b326faa1811f2d207a /devel | |
| parent | e0c791f67658af7786e4976e1444f0123a9fd680 (diff) | |
| download | freebsd-ports-gnome-f04afbc79b715c97cf48c3a24097f447fa8f8d3a.tar.gz freebsd-ports-gnome-f04afbc79b715c97cf48c3a24097f447fa8f8d3a.tar.zst freebsd-ports-gnome-f04afbc79b715c97cf48c3a24097f447fa8f8d3a.zip | |
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
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/google-sparsehash/Makefile | 4 | ||||
| -rw-r--r-- | devel/google-sparsehash/files/patch-src__sparsehash__internal__sparsehashtable.h | 29 |
2 files changed, 31 insertions, 2 deletions
diff --git a/devel/google-sparsehash/Makefile b/devel/google-sparsehash/Makefile index 6dd1e2a93a92..4f45b0a1d764 100644 --- a/devel/google-sparsehash/Makefile +++ b/devel/google-sparsehash/Makefile @@ -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 diff --git a/devel/google-sparsehash/files/patch-src__sparsehash__internal__sparsehashtable.h b/devel/google-sparsehash/files/patch-src__sparsehash__internal__sparsehashtable.h new file mode 100644 index 000000000000..67b264fd0a22 --- /dev/null +++ b/devel/google-sparsehash/files/patch-src__sparsehash__internal__sparsehashtable.h @@ -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! |