From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 501411395E2 for ; Sun, 20 Nov 2016 18:54:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D262E0BB4; Sun, 20 Nov 2016 18:54:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63114E0BB4 for ; Sun, 20 Nov 2016 18:54:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0AE6A34112A for ; Sun, 20 Nov 2016 18:54:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A21FB492 for ; Sun, 20 Nov 2016 18:54:40 +0000 (UTC) From: "Slawek Lis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slawek Lis" Message-ID: <1479668066.45ccd11f3680e49e765acc6329181555c0911350.slis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/, net-analyzer/ntopng/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/ntopng/files/ntopng-2.4-cxx.patch net-analyzer/ntopng/ntopng-2.4.ebuild X-VCS-Directories: net-analyzer/ntopng/ net-analyzer/ntopng/files/ X-VCS-Committer: slis X-VCS-Committer-Name: Slawek Lis X-VCS-Revision: 45ccd11f3680e49e765acc6329181555c0911350 X-VCS-Branch: master Date: Sun, 20 Nov 2016 18:54:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4fcbbf2e-504b-4916-98b8-712af5cc0ca0 X-Archives-Hash: 9a3015bf35bc7d4485e44dff172297b8 commit: 45ccd11f3680e49e765acc6329181555c0911350 Author: Slawomir Lis gentoo org> AuthorDate: Sun Nov 20 18:54:26 2016 +0000 Commit: Slawek Lis gentoo 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