[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sparsehash/, dev-cpp/sparsehash/files/

[David Seifert]

commit:     953d20e666f14423bd3f88dad41539a6441927a7
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  4 09:55:28 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 09:55:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953d20e6

dev-cpp/sparsehash: Remove automagic dep on google-perftools

Closes: https://bugs.gentoo.org/show_bug.cgi?id=585968
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../files/sparsehash-2.0.3-fix-buildsystem.patch   | 71 ++++++++++++++++++++++
 .../files/sparsehash-2.0.3-fix-docdir.patch        | 21 -------
 ...ash-2.0.3.ebuild => sparsehash-2.0.3-r1.ebuild} |  2 +-
 3 files changed, 72 insertions(+), 22 deletions(-)

diff --git a/dev-cpp/sparsehash/files/sparsehash-2.0.3-fix-buildsystem.patch b/dev-cpp/sparsehash/files/sparsehash-2.0.3-fix-buildsystem.patch
new file mode 100644
index 00000000000..237719c3b9f
--- /dev/null
+++ b/dev-cpp/sparsehash/files/sparsehash-2.0.3-fix-buildsystem.patch
@@ -0,0 +1,71 @@
+* Do not override $(docdir) as part of the GNU conventions
+* Do not install 'COPYING' and 'INSTALL'
+* Install html files using html_ prefix and not doc_ prefix
+* Do not try to link against tcmalloc, the complexity of juggling
+  the options around isn't worth it
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=585968
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@
+ # (for sanity checking)
+ AC_CONFIG_SRCDIR(README)
+ AM_INIT_AUTOMAKE([dist-zip])
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS([src/config.h])
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+@@ -28,23 +28,7 @@
+ # These are 'only' needed for unittests
+ AC_CHECK_HEADERS(sys/resource.h unistd.h sys/time.h sys/utsname.h)
+ 
+-# If you have google-perftools installed, we can do a bit more testing.
+-# We not only want to set HAVE_MALLOC_EXTENSION_H, we also want to set
+-# a variable to let the Makefile to know to link in tcmalloc.
+ AC_LANG([C++])
+-AC_CHECK_HEADERS(google/malloc_extension.h,
+-                 tcmalloc_libs=-ltcmalloc,
+-                 tcmalloc_libs=)
+-# On some systems, when linking in tcmalloc you also need to link in
+-# pthread.  That's a bug somewhere, but we'll work around it for now.
+-tcmalloc_flags=""
+-if test -n "$tcmalloc_libs"; then
+-  ACX_PTHREAD
+-  tcmalloc_flags="\$(PTHREAD_CFLAGS)"
+-  tcmalloc_libs="$tcmalloc_libs \$(PTHREAD_LIBS)"
+-fi
+-AC_SUBST(tcmalloc_flags)
+-AC_SUBST(tcmalloc_libs)
+ 
+ # Figure out where hash_map lives and also hash_fun.h (or stl_hash_fun.h).
+ # This also tells us what namespace hash code lives in.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,12 +11,11 @@
+ AM_CXXFLAGS = -Wall -W -Wwrite-strings -Woverloaded-virtual -Wshadow
+ endif
+ 
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+ ## This is for HTML and other documentation you want to install.
+ ## Add your documentation files (in doc/) in addition to these boilerplate
+ ## Also add a TODO file if you have one
+-dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt \
+-   TODO \
++dist_doc_DATA = AUTHORS ChangeLog NEWS README README_windows.txt TODO
++dist_html_DATA = \
+    doc/dense_hash_map.html			\
+    doc/dense_hash_set.html			\
+    doc/sparse_hash_map.html			\
+@@ -182,11 +181,6 @@
+    $(sparsehashinclude_HEADERS)
+ nodist_time_hash_map_SOURCES = $(nodist_internalinclude_HEADERS)
+ 
+-# If tcmalloc is installed, use it with time_hash_map; it gives us
+-# heap-usage statistics for the hash_map routines, which is very nice
+-time_hash_map_CXXFLAGS = @tcmalloc_flags@ $(AM_CXXFLAGS)
+-time_hash_map_LDFLAGS = @tcmalloc_flags@
+-time_hash_map_LDADD = @tcmalloc_libs@
+ 
+ ## ^^^^ END OF RULES TO MAKE THE LIBRARIES, BINARIES, AND UNITTESTS
+ 

diff --git a/dev-cpp/sparsehash/files/sparsehash-2.0.3-fix-docdir.patch b/dev-cpp/sparsehash/files/sparsehash-2.0.3-fix-docdir.patch
deleted file mode 100644
index 156a7266eaa..00000000000
--- a/dev-cpp/sparsehash/files/sparsehash-2.0.3-fix-docdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-* Do not override $(docdir) as part of the GNU conventions
-* Do not install 'COPYING' and 'INSTALL'
-* Install html files using html_ prefix and not doc_ prefix
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,12 +11,11 @@
- AM_CXXFLAGS = -Wall -W -Wwrite-strings -Woverloaded-virtual -Wshadow
- endif
- 
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
- ## This is for HTML and other documentation you want to install.
- ## Add your documentation files (in doc/) in addition to these boilerplate
- ## Also add a TODO file if you have one
--dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt \
--   TODO \
-+dist_doc_DATA = AUTHORS ChangeLog NEWS README README_windows.txt TODO
-+dist_html_DATA = \
-    doc/dense_hash_map.html			\
-    doc/dense_hash_set.html			\
-    doc/sparse_hash_map.html			\

diff --git a/dev-cpp/sparsehash/sparsehash-2.0.3.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.3-r1.ebuild
similarity index 88%
rename from dev-cpp/sparsehash/sparsehash-2.0.3.ebuild
rename to dev-cpp/sparsehash/sparsehash-2.0.3-r1.ebuild
index 223e0ba7546..b043e1800ff 100644
--- a/dev-cpp/sparsehash/sparsehash-2.0.3.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-2.0.3-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 S=${WORKDIR}/${PN}-${P}
 
-PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-docdir.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-buildsystem.patch )
 
 src_prepare() {
 	default