From nobody Mon Dec 13 20:59:53 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 26A0D18ED02F; Mon, 13 Dec 2021 20:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JCYmT6Qmkz3k6C; Mon, 13 Dec 2021 20:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD4D81B888; Mon, 13 Dec 2021 20:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BDKxrFv004630; Mon, 13 Dec 2021 20:59:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDKxrcJ004629; Mon, 13 Dec 2021 20:59:53 GMT (envelope-from git) Date: Mon, 13 Dec 2021 20:59:53 GMT Message-Id: <202112132059.1BDKxrcJ004629@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 63cd929ef52c - main - archivers/7-zip: minor fix List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63cd929ef52ccbdc059c9a2db905aa213f5ec2c3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639429193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+ull1pIVSmEkbloT+LGlFlAN+hy0Z8WtC3PuRQmtbE=; b=a5oKrQwJCzGKjIQlAC4p36n1Hj8LdP3p/bEJxo0eMlPZ7NKZTcyf4DYYPWsPQnksQENO1M xMMpOvJHyAVHPiBxwFbwRmsiImLq+bYNQFuWkhT15Hy/EBcVoBeb1JAYG5OSI+H1gHzEm0 Y8bftkuIKrFPR4OOgitXYTcllawsj1HgTqNZTN68vFUEtvPEKjji1omK4/igJwj+884kcD HAB4BrlSNg0fFy2/H4TcfwNCdGb/S2pX2uvknJf24xUUp5Z1X6cp0e/MAJp5DZbHs8+di+ yUY/zjTIpCWI6KJVrwbsaSyvq5xramGmsFPU8d2LtXhJdfYdCdI7SQJHvcFg3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639429193; a=rsa-sha256; cv=none; b=Nn/3cLRJBlbD6/iEfG9e9fbsSyXYa08SO0df6v+Z59fUsMaAbx6RAwwI3OOQFmT7VwRYaw TNbb8XTFgClC7dHHQNxoIrO4izk2Xwo+KGuC40CA9nruHAX4eOI6KiOJjq/c/a63R/3N4U 6kN1ND8C0UAQV+nqW1KclKRmFG+jTPvoseDLwnaE1cnPBXnpzwRc4LfkUywU7KWK16qDbR ElSC8YnQfVog112cf2pIFubGdfZqbhgEBU4p7QYWLDUNg4r77zJS88CnzwzNT1QQtRwpcw plGHOkSFhKBBg18ar4ITgu3lHK1S2O/8nEZL9p7y59N4MF3mD6T12D04IKniZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=63cd929ef52ccbdc059c9a2db905aa213f5ec2c3 commit 63cd929ef52ccbdc059c9a2db905aa213f5ec2c3 Author: Max Brazhnikov AuthorDate: 2021-12-13 20:58:56 +0000 Commit: Max Brazhnikov CommitDate: 2021-12-13 20:58:56 +0000 archivers/7-zip: minor fix Avoid CFLAGS duplication and remove excessive warning flags --- archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak b/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak index 593e77c4da87..82ace8e6b679 100644 --- a/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak +++ b/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak @@ -1,13 +1,20 @@ ---- CPP/7zip/7zip_gcc.mak.orig 2021-12-10 11:04:08 UTC +--- CPP/7zip/7zip_gcc.mak.orig 2021-12-12 12:16:07 UTC +++ CPP/7zip/7zip_gcc.mak -@@ -22,7 +22,7 @@ CFLAGS_BASE_LIST = -c +@@ -14,13 +14,13 @@ PROGPATH_STATIC = $(O)/$(PROG)s + + + ifneq ($(CC), xlc) +-CFLAGS_WARN_WALL = -Wall -Werror -Wextra ++CFLAGS_WARN_WALL = + endif + + # for object file + CFLAGS_BASE_LIST = -c # CFLAGS_BASE_LIST = -S - CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ +-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ ++CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -- -fPIC -+ -fPIC $(LOCAL_FLAGS) - - # -D_7ZIP_AFFINITY_DISABLE + -fPIC @@ -111,7 +111,7 @@ MY_MKDIR=mkdir -p