commit: 45ccd11f3680e49e765acc6329181555c0911350
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 18:54:26 2016 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 18:54:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ccd11f
net-analyzer/ntopng: Patch to use CC/CXX variables
This fixes a bug 600246, where clang++ was used directly.
Thanks to Chris White.
Package-Manager: portage-2.3.2
net-analyzer/ntopng/files/ntopng-2.4-cxx.patch | 44 ++++++++++++++++++++++++++
net-analyzer/ntopng/ntopng-2.4.ebuild | 1 +
2 files changed, 45 insertions(+)
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
new file mode 100644
index 00000000..330f681
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
@@ -0,0 +1,44 @@
+diff -ru ntopng-2.4-stable.orig/configure.ac ntopng-2.4-stable/configure.ac
+--- ntopng-2.4-stable.orig/configure.ac 2016-11-20 03:59:19.928851928
-0800
++++ ntopng-2.4-stable/configure.ac 2016-11-20 03:59:53.717850915 -0800
+@@ -341,14 +341,6 @@
+ GMAKE="make"
+ fi
+
+-GPP=`which clang++`
+-if test x$GPP = x
+-then
+- GPP="g++"
+-else
+- GPP="$GPP -O0"
+-fi
+-
+ GIT=`which git`
+ if test x$GIT = x
+ then
+diff -ru ntopng-2.4-stable.orig/Makefile.in ntopng-2.4-stable/Makefile.in
+--- ntopng-2.4-stable.orig/Makefile.in 2016-06-27 12:31:18.000000000 -0700
++++ ntopng-2.4-stable/Makefile.in 2016-11-20 04:00:31.037849796 -0800
+@@ -4,7 +4,6 @@
+ SHELL=/bin/sh
+ OS := $(shell uname -s)
+ PWD=@PWD@
+-GPP=@GPP@
+ INSTALL_DIR=$(DESTDIR)$(prefix)
+ MAN_DIR=$(DESTDIR)@MAN_DIR@
+
+@@ -126,12 +125,12 @@
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+ %.o: %.cpp $(HEADERS) Makefile
+- $(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+
+ .PRECIOUS: $(TARGET) $(OBJECTS)
+
+ $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
+- $(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
++ $(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@
+
+ $(LUAJIT_LIB):
+ cd $(LUAJIT_HOME); @GMAKE@
diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild
b/net-analyzer/ntopng/ntopng-2.4.ebuild
index 2141a1a..f6c9071 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.4.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed
"s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
epatch "${FILESDIR}/${P}-mysqltool.patch"
+ epatch "${FILESDIR}/${P}-cxx.patch"
sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
eautoreconf
