From nobody Mon Feb 13 08:10:02 2023 X-Original-To: dev-commits-ports-all@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 4PFcT72Qctz3ph9r; Mon, 13 Feb 2023 08:10:03 +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 4PFcT71vgXz3DD4; Mon, 13 Feb 2023 08:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676275803; 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=L+xIZn6NueOhmF9J971hSZ+Pra7EFuyKLjhjZiHDOT8=; b=hC9R3lxtQkLAYA++7tQW9gNzrgmj92dqb+fN90127M4NV6sKNc//t1Elle+i7wrVxmYaZg pkN9D4363Td2fgwp0J5JqRRdZopSwLQPM/U4eiXr0cZB3ICLKY2Pyn3oNLsrtOwY8OzlnC 779luvgZarLlxrFnlBNurKALLy0IYjtkVGc3cfiT8Ze7cwMqNfoIQMUwfXM2xKfnq2MrBQ 4LD4A9TMxRViDdmDmKQWsPjh/j3L7tc7HqlczVbygLWjsoRuMSNIlQG9O/RWjrDoh/IFK8 Uuki5n8OGTocupzYo7TplaMf2/X8JHxjGwbiYGFOCfs6nOlK1SqJ82wr5NVPDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676275803; 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=L+xIZn6NueOhmF9J971hSZ+Pra7EFuyKLjhjZiHDOT8=; b=cGDKfzEmKq1vMfInS0Ptdbq9RCcZYWXNpsIQSGPG3oCFphSnT4HUpVra1SbpIBp9V4vH0S lGps5LezR36YPAXkxzhLmLwslI/YeBJulK+J/CtKv/QjSar23ZGlia3eBscvo/GEfLCfi7 HJ47NIIfr4Oc/XQrO2Qzv+sy561UICeF+RQz4z3i1bd0Qh77hre9sCNT7uJR8zbnMkaqwE qa3q1T890cHxG4bCMrl4dx0l7CgfrTVyM2mqRQ02lVJuakiIpZTtfo/mhvU+EVIEDNLRqD NI9/UQoNrNIkyHA7AiorHPFoCMHLfKXFudZFAhXcHv1B6lItzESlMKTBFkZjzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676275803; a=rsa-sha256; cv=none; b=UK44HgsP0d6ppOcqpuDpggD+9VD3S+6RiitCkuIZZxLa1Y5rBFgUj9vEIEX/RCVy3D9cm/ 3fv4WKCfp3T2ptScYE6xeqlA78/7NwT1bCwYP2pPN9bWnB0aG4mlja6PkqtazGXVTgxu7z MOoxO/pGKb31snKRez0v0NcMhV6fmzPfi5flRewEhJuZF6ujjOit3l/+XYDNvnl9NSUXSy iufyh+he/KfZx8dwdKj9abP8u7qXmLR/EYE0LNwN7PuwVNzBWX7lPjZmLE7TH0nOY1e3/H w4x33Aw49rF6r6PU2WNlCX4s9R5xoxQIPEWst1UnwZXI+Z271WQ9CWmC/T87OQ== 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 4PFcT70sFzz19pJ; Mon, 13 Feb 2023 08:10:03 +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 31D8A2QO041264; Mon, 13 Feb 2023 08:10:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31D8A23Z041261; Mon, 13 Feb 2023 08:10:02 GMT (envelope-from git) Date: Mon, 13 Feb 2023 08:10:02 GMT Message-Id: <202302130810.31D8A23Z041261@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: c7e073a677e7 - main - ports-mgmt/pkg: fix regression in pkg-static and version number List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7e073a677e754db2247a179524bcda3bc9f42c6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c7e073a677e754db2247a179524bcda3bc9f42c6 commit c7e073a677e754db2247a179524bcda3bc9f42c6 Author: Baptiste Daroussin AuthorDate: 2023-02-13 08:07:57 +0000 Commit: Baptiste Daroussin CommitDate: 2023-02-13 08:09:56 +0000 ports-mgmt/pkg: fix regression in pkg-static and version number When adding the support for static PIE, we masked the actually STATIC_ARGS making pkg-static a dynamic binary in all other cases. While here fix the version numbering which was not updated properly during the release process. --- ports-mgmt/pkg/Makefile | 5 ++++- ports-mgmt/pkg/files/patch-auto.def | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 5e70aeb1471c..5b8e69da2486 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -24,7 +24,6 @@ CONFIGURE_ENV= CC_FOR_BUILD="${CC}" USE_SUBMAKE= yes CFLAGS+= -Wno-error CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 -MAKE_ARGS+= STATIC_ARG="${STATIC_PIE_ARG}" OPTIONS_DEFINE= DOCS @@ -38,6 +37,10 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .endif +.if defined(WITH_PIE) +MAKE_ARGS+= STATIC_ARG="-static ${STATIC_PIE_ARGS}" +.endif + .if defined(WITH_PKG) .if ${WITH_PKG} == devel IGNORE= WITH_PKG is defined to 'devel', this version is the stable one diff --git a/ports-mgmt/pkg/files/patch-auto.def b/ports-mgmt/pkg/files/patch-auto.def new file mode 100644 index 000000000000..f6e9bdb88b96 --- /dev/null +++ b/ports-mgmt/pkg/files/patch-auto.def @@ -0,0 +1,11 @@ +--- auto.def.orig 2023-02-01 15:55:57 UTC ++++ auto.def +@@ -5,7 +5,7 @@ set med_ver 19 + + set maj_ver 1 + set med_ver 19 +-set min_ver 0 ++set min_ver 1 + set dev_ver 0 + define PKG_API [expr $maj_ver * 1000000 + $med_ver * 1000 + $min_ver] + define VERSION $maj_ver.$med_ver.$min_ver[expr {$dev_ver ? ".$dev_ver" : ""}]