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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD992158015 for ; Fri, 29 Dec 2023 04:47:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 292292BC024; Fri, 29 Dec 2023 04:47:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E86682BC024 for ; Fri, 29 Dec 2023 04:47:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B28FC340C42 for ; Fri, 29 Dec 2023 04:47:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25DD8EE8 for ; Fri, 29 Dec 2023 04:47:26 +0000 (UTC) From: "YiFei Zhu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "YiFei Zhu" Message-ID: <1703825171.17459d22ae169dca5639fea5f33a9f7d4ab99412.zhuyifei1999@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-analyzer/netsniff-ng/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-analyzer/netsniff-ng/netsniff-ng-0.6.8-r1.ebuild net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild X-VCS-Directories: net-analyzer/netsniff-ng/ X-VCS-Committer: zhuyifei1999 X-VCS-Committer-Name: YiFei Zhu X-VCS-Revision: 17459d22ae169dca5639fea5f33a9f7d4ab99412 X-VCS-Branch: dev Date: Fri, 29 Dec 2023 04:47:26 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 43315493-f2e1-4158-85a5-6e1a61035e93 X-Archives-Hash: 43b795e916c8cc4b8d3e52546032e4c0 commit: 17459d22ae169dca5639fea5f33a9f7d4ab99412 Author: YiFei Zhu gmail com> AuthorDate: Fri Dec 29 04:46:11 2023 +0000 Commit: YiFei Zhu gmail com> CommitDate: Fri Dec 29 04:46:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=17459d22 net-analyzer/netsniff-ng: Respect CFLAGS, cleanup emake command Closes: https://bugs.gentoo.org/920892 Closes: https://bugs.gentoo.org/920893 Signed-off-by: YiFei Zhu gmail.com> ...niff-ng-0.6.8.ebuild => netsniff-ng-0.6.8-r1.ebuild} | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.8-r1.ebuild similarity index 80% rename from net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild rename to net-analyzer/netsniff-ng/netsniff-ng-0.6.8-r1.ebuild index a013c30f42..077fe39404 100644 --- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.8.ebuild +++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.8-r1.ebuild @@ -32,7 +32,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/flex + app-alternatives/lex sys-devel/bison dev-libs/libsodium virtual/pkgconfig @@ -41,14 +41,9 @@ BDEPEND=" src_prepare() { default - sed -e '/CFLAGS/s:?=:+=:' \ - -e '/CPPFLAGS/s:?=:+=:' \ - -e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \ - -i Makefile || die - - if ! grep -Fq nacl-20110221 curvetun/nacl_build.sh ; then - die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)" - fi + # force mausezahn to respect CFLAGS + sed -e '/CFLAGS/s:=:+=:' -i Extra || die + sed -e 's/ -O2//' -i mausezahn/Makefile || die export NACL_INC_DIR="${EPREFIX}/usr/include/nacl" export NACL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/nacl" @@ -77,9 +72,7 @@ src_configure() { } src_compile() { - emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \ - LEX=lex YAAC=bison STRIP=true \ - Q= HARDENING=1 + emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" Q= } src_install() {