From nobody Tue Aug 1 14:13:05 2023 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 4RFcX214SGz4qDQy; Tue, 1 Aug 2023 14:13:05 +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 4RFcX12gDMz44b7; Tue, 1 Aug 2023 14:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690899185; 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=jIxzX6bP728YZqy7fs9K7TJBQQlhGsI+9jOesUd5uZ0=; b=MxEGpyT2fXx8mas7AVvx7VG2a75ywST/yhW9I70tybHlpZ3bpK2R+ipJz0nzTjMpc6lzTs jtotzOK+Kk6YD0o9l8TcoJZ5p+iJ2AfRqZuG6zRVq6zhV1xYjWHK8dpeAVu2BLCiR8+RBd krSAPjvt9hmwch2so59hHX4+qS0OBVnfAdBF/BIQ7kaCj08zUVInNCng3Vf0VojGH/nxwp ij8QyPaZ1QniJalHHgKcCzeK0pNhpXY2l2fVdg4NHzX72m8f91oB1l45LMqto5DXj8XYxd UhWP1l+KwqG9VPARBHwdiYJKPJwGkReOoPInHMMsp+tBOYQrC4VhH1UdfejqVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690899185; a=rsa-sha256; cv=none; b=LsMW4Uu9L/HLuj3HaBQFZt+SfK55xxcD18vnU2jnlPBAnHv772Rb/AiyA6jzhe+fZL1Su1 BD9dILzRrfvjFVn8spTmPsWmok6uLHJG/DH2KqlMqlDVn/IWsRyE6bhNHhriHK4MfvKnYi P0HjH8rniigUthKZ9LIdQgUEuKIzQxK9Daqvmic4yUtoAtyu3nFChwmyD+S//JA4cYH7kE xdfxj3TQ30q14HgV+itw6vYdhpwYIobdc0iOeuQ2tlfEK5Wjt1XOJor3cbhqs+ZutFEYx5 UH1Ee8PHALf8sIR+ohuRy1cN3bWPIXZOYX94SW2KoYZjitLezHuuDwkivWT22Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690899185; 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=jIxzX6bP728YZqy7fs9K7TJBQQlhGsI+9jOesUd5uZ0=; b=nQPsiO8kPozrfOGn4QdkGsrqtFWmMyyly6y20vVKz+qcb96T7JT83JDoK49Lw6dhm/aJ4u pirBlnwXd1/he+LruA4ai1J29je4P08zkLEEkOTuJ+7CBhA13jLn7B1/KAdvRAHx5hV9Ut vhWPIzsf/exn4EHoQvYMTg0cylK6qrurRa9NKX5LQgu9hl8Gj+RE1xHJBrW8nlr5YXywFb FyChp1w3TB3jmiOrZCKMuq+fjdrFiqb3FbxFaQkvJ92o9r6uJiNcAQTGuY5Dzmipq08Xv9 4fl98Si+ju8xGB4EGs8p/CvjxB7r8rJNx9DBBA7Y3DfTnkjxf68B3ajq/yjnRQ== 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 4RFcX118q9zgJn; Tue, 1 Aug 2023 14:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371ED54P031923; Tue, 1 Aug 2023 14:13:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371ED5sd031922; Tue, 1 Aug 2023 14:13:05 GMT (envelope-from git) Date: Tue, 1 Aug 2023 14:13:05 GMT Message-Id: <202308011413.371ED5sd031922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 848ff9bc1b97 - main - libdtrace: Explicitly set SHLIBDIR and SHLIB_MAJOR 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 848ff9bc1b97b04a0b7328ec7079fb031fef452d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=848ff9bc1b97b04a0b7328ec7079fb031fef452d commit 848ff9bc1b97b04a0b7328ec7079fb031fef452d Author: Mark Johnston AuthorDate: 2023-08-01 14:11:23 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 14:11:42 +0000 libdtrace: Explicitly set SHLIBDIR and SHLIB_MAJOR They were previously being defined by cddl/lib/Makefile.inc, and as of commit 4ae699122810 were being overridden by defaults in bsd.own.mk, which changed SHLIBDIR to /usr/lib. Reported by: Domagoj Stolfa Fixes: 4ae699122810 ("dtrace: Add WITH_DTRACE_ASAN") --- cddl/lib/libdtrace/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index a6a7b90d3d39..d6771aee37b6 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -7,6 +7,10 @@ PACKAGE= dtrace LIB= dtrace + +SHLIBDIR= /lib +SHLIB_MAJOR= 2 + SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \