From nobody Wed Apr 19 03:22:43 2023 X-Original-To: dev-commits-src-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 4Q1R1c2Jyqz44rwt; Wed, 19 Apr 2023 03:22:44 +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 4Q1R1b5nWzz4KJM; Wed, 19 Apr 2023 03:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681874563; 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=7wf8Mm9HFUgUm9cHzIjwEYUXYCdhhDGAqYC6xht2yDs=; b=JOLxRAlHVJym/+kCcGhxY27BwXbWfMttylFetNxUt3I12w/tiv+8/7h9pZchnb26fzZGHJ GnEia4mSKJTdofqWCgMVDHaVk7mz9KzNsCJ+e0HUl8h7/puCFA1kmPRkdXnTx55G2dNAcf MZ4FJ8C5AjEkl36FGTeNoWf5094XCfhV+L6IXmScu7KE4qIfSuoLLFNG2Ioxmj/uHtNjZx tqUjS3D9F4zOdm6XFwRXxtUuzSkmKHZQad1GDay1HrqGuRB8LqBYxIzkH1OxRC43S5C4mp U40AG6EEGKKETMIFNw/GxjHw/9DlTZSS0f6wRWBcpaIcqzeAm8bEgZBQ6dUTdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681874563; 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=7wf8Mm9HFUgUm9cHzIjwEYUXYCdhhDGAqYC6xht2yDs=; b=UwifRiBGLs11wBGZ/jSpSE/nDkiY2QSjMtUEcjQeZ5c1bsNuRM8moYhP28wyPJ5qB1z2OW P4inLyi0ri/80JC392UO+qcFllGhgkgnpCMEguMT7YJ59ice/zxABRToSnpf3ZqUPsWSgb CgI4KpoPpXYrUX74hXlyJnZnzKwL7sM7MX1AjboJP6sL6EVWiy3kTf4dGGfNUQqdnpW684 lCqWDyIKGIVlPW7X2C8bArMnhsc4MLr+//BqShxBf3BH2U3UFxFjaHoy5gEMxUU3AaEFJD DPaDW3wSiMw5nHHTvc7baoh4sEvNianjstWsiywRxDooCg9k/+j/84ORKmupEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681874563; a=rsa-sha256; cv=none; b=qHi4lW/B5dg3oZMMG2lSYmdv7J8s4+Vik7D97dglbaxnI+Juspd64i+ooRuJDi6TM7IT7M M2gG5g4DpYYyYDRPKwMPUy7uD++VmHDB2LFXwltHos5sbgxv9sYkK5KsqHe0d4XSASgaKs ZJ9MW+SwhkmsFNya8sySaGxjWyuVOU82eX2F4ka97fcrKC5qZghjGNLNFJ+4Ei10+6HSP8 KNJ9fWehkrKkp/1S+Vi71rXg5R8P2LNXIbF2gKg8fundFVtAoDe8EohFtGuA2jrIt3/kMH pBTGTcQ6Zm0HIfpkIyHOPaklzjDXcecftypzi1WGLALjBuMB80jo3Bre8cr5nw== 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 4Q1R1b4trVzdmb; Wed, 19 Apr 2023 03:22:43 +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 33J3Mh7d007904; Wed, 19 Apr 2023 03:22:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33J3MhvV007903; Wed, 19 Apr 2023 03:22:43 GMT (envelope-from git) Date: Wed, 19 Apr 2023 03:22:43 GMT Message-Id: <202304190322.33J3MhvV007903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 5ef0969e6247 - main - Handle libs that create linker scripts as libs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ef0969e6247bf79230a04a0134a649e67305165 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5ef0969e6247bf79230a04a0134a649e67305165 commit 5ef0969e6247bf79230a04a0134a649e67305165 Author: Simon J. Gerraty AuthorDate: 2023-04-19 03:22:13 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-19 03:22:13 +0000 Handle libs that create linker scripts as libs Eg ncurses creates libncursesw.ald This is the only example so far, but if we are staging handle it. Reviewed by: stevek --- share/mk/bsd.sys.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 9d24c87d9eea..19f92d8f9d5d 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -437,6 +437,14 @@ STAGE_AS_${SHLIB_LINK:R}.ld:= ${SHLIB_LINK} NO_SHLIB_LINKS= .endif +.if defined(STATIC_LDSCRIPT) && target(lib${LIB}.ald) +STAGE_AS_SETS+= ald +STAGE_DIR.ald = ${STAGE_LIBDIR} +STAGE_AS.ald+= lib${LIB}.ald +STAGE_AS_lib${LIB}.ald = lib${LIB}.a +stage_as.ald: lib${LIB}.ald +.endif + .if target(stage_files.shlib) stage_libs: ${_LIBS} .if defined(DEBUG_FLAGS) && target(${SHLIB_NAME}.symbols)