From nobody Sun Dec 12 18:28:58 2021 X-Original-To: dev-commits-src-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 8181A18CC9CB; Sun, 12 Dec 2021 18:28:59 +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 4JBtSq1pPmz3mHJ; Sun, 12 Dec 2021 18:28:59 +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 1A07325E62; Sun, 12 Dec 2021 18:28:59 +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 1BCISw9I078728; Sun, 12 Dec 2021 18:28:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCISw2R078727; Sun, 12 Dec 2021 18:28:58 GMT (envelope-from git) Date: Sun, 12 Dec 2021 18:28:58 GMT Message-Id: <202112121828.1BCISw2R078727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 10172d4fca70 - stable/12 - Move _p.a profiling archives under MK_INSTALLLIB List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 10172d4fca7010c3bdc1e8dd2a4f5b6f8ece2421 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639333739; 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=2SHyUu+WDZIX+5G9cpiJHM+TU/znOfLlzeLvIoj+/Cs=; b=X77UC+FkExAPqWlH8CN0zy/XbHd9YdfFI8MqGdk9hI96zVFxXULsS4KCiA+QHTlD2keckB gf0VquRjBUJ4lSvSVmJjlzwZKv/gL8YCFGeR8Maz6f90BM2x3fs0h3RgwMMNrjoAN8A8K9 Y5ReiHWgzDeQMzMqXghz/HrMRRBE1Hc4ZSENzxkUwMlILyvlsuRXkKVce6gHWoTwSwy2Ye 0eeTB2g7VtVVNfPUdcxNzkybN5CQVZOLw5tI8pKNYZDjdzTRWlnbpOUhYAEmBOthbwQigf q4FE7QBqb0SzH9dnAHOf8AApcofKjmVWo4s44HWv4cNoAiuNOcNUIuo6PPbcCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639333739; a=rsa-sha256; cv=none; b=ZYN9YhdutBjnQ3RrUJKaxx5umROPt0Y2Ol3rD0xsxniesE8XkCKHZDlAiRxcf0z8+fUdmW Nok+5kqBNNDJVOJWBZF+GfLyiqpK69nAD6yXViZ7S+RiGC4Op+Ejj1uuDg9yPLXvNz2h0o Io0/fHJpSLClLXXXoW6i7iQYi+xWQlNn3Z2mZIqJyxHgGo4YEkHOQFGo9vs4yVasy+uRgH NWTOg/ggp8d+yrWwiv/lLJuJbfGT945xe0AOnzCipSuGRWjLTs8hvGaHjgHDFkSPGuoy02 ggWKJ/FkPOxds3zF9wrLjI5sC3FNfiJfjMstNuMQcKz8r2DyAbDrXy6L89D+Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10172d4fca7010c3bdc1e8dd2a4f5b6f8ece2421 commit 10172d4fca7010c3bdc1e8dd2a4f5b6f8ece2421 Author: Ed Maste AuthorDate: 2021-12-02 15:27:12 +0000 Commit: Ed Maste CommitDate: 2021-12-12 18:28:47 +0000 Move _p.a profiling archives under MK_INSTALLLIB _p.a are just a special case of .a archives, and should not be installed if WITHOUT_INSTALLLIB is set. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit fc073e6743a989c9d0b8f619ce0f903271c0db2e) (cherry picked from commit 0421d8bdef00c710a38cb11547a91c8fde2c5c8c) --- share/mk/bsd.lib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 1b98ad36280e..d99360f0e2bf 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -425,11 +425,11 @@ _libinstall: .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/ -.endif -.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) +.if ${MK_PROFILE} != "no" ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/ .endif +.endif .if defined(SHLIB_NAME) ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \