From nobody Mon Aug 28 19:30:00 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 4RZLHF2J9pz4rsgH; Mon, 28 Aug 2023 19:30:01 +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 4RZLHF1p8bz3dRl; Mon, 28 Aug 2023 19:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693251001; 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=mqUqVtXuImYc+I/n+67jrGGmVZJZB9/s+HNcFjeQ94U=; b=U8+FvEiEJ5Z3P1KprxCOQ2GOoIdBwCN1AnnBdbqkOp2JmHwdbqFvFBHSgy8reT3O2qSodc QB/UPYLZnSx6d9zdWf5SVp0DvDmt5rhnGTE6jPLxVkvDRTYDuCaezzz+rCmtwRpSl44q0f cWiJ8YprVvGYxZb/O78HKKP16VwMYsQG0pmiSPg8/qsEJB/sq/HbvBVdLA0HQbTwlL5Vrx pKJQadic5ZfoOQNRA0WVDkHmUQFP1grcTq1kX7EjsvIaIlFgyuTpBMTiLcbIsuQ4XnH9IW 0RNZACpDNkr3oPkGh2x84BIbxyZxg5Xjh81FhaCKicnyNO24KlM+DY/hJJSVng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693251001; a=rsa-sha256; cv=none; b=m42KGwcJqjtQo9cnhVyq8u/xGPWKWrG87qqdg/bA+3uohDWTb4RbVRoL15emJbbxNS0c6b 7iT8Cj1DzUZdOx+xQ49UWrO7O1jP5dknFd2PnrM4eAOo75uaEOfcEMj1eHQJZDj9mcsBjQ L6Yl/CpYXQCDB2CSeSuEyOx/42ktSxLpXnCZG5AhXZHOma1XvNbjwDdgL4LE12eCdjLuXW bPhSB5/HPK2ajVukDZmYchrELEC1f2vQEq6O8+QhLMwEFSgCSnrKKPqhVnaH+J/tGAO4j0 ln+VRvxX1Rfzs6fkBMVUt+WlSR03cuusCuoHwK3VplWsv8xGXYxQb8ahDJGKIA== 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=1693251001; 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=mqUqVtXuImYc+I/n+67jrGGmVZJZB9/s+HNcFjeQ94U=; b=ltQSbGppxW5JBMSV2ydxBTzw5b163nJ7aLcWYAj4dbA6wOYHKEhzCuC+pDCjkdD8Z7GGVj 9Tz5NvTC5PH+Aruo7Wu6s3O5alWVpOQRuTGUs0ugRqYnDwf6D3Ele0UkWMDwrfuHXxA0mT JcxWnekvlBh4zm89dlFhcAhmSrayzKUTGcWyXbMG9wnzOlwrtA7e+deOrK05HbDlKbe+uL oh25ZXix8msMJyv1edD5EL98F8t5kavot4FALiG0qfH1EZKvR/RWxS1a0YyDuoUA03crsl 2+PfqNfTkIpMTL4VRcdZoA/rfClMybcJJAcVivsbnA+zgdCHOwJzZm9pi113pQ== 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 4RZLHF0lcCz6Bh; Mon, 28 Aug 2023 19:30:01 +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 37SJU0mx064798; Mon, 28 Aug 2023 19:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37SJU0i6064774; Mon, 28 Aug 2023 19:30:00 GMT (envelope-from git) Date: Mon, 28 Aug 2023 19:30:00 GMT Message-Id: <202308281930.37SJU0i6064774@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: bba950fcaffc - main - librt: Hoist SHLIBDIR?= so it actually works 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bba950fcaffc648d931da9dc07aeb85a1bf86cfc Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=bba950fcaffc648d931da9dc07aeb85a1bf86cfc commit bba950fcaffc648d931da9dc07aeb85a1bf86cfc Author: Jessica Clarke AuthorDate: 2023-08-28 19:27:50 +0000 Commit: Jessica Clarke CommitDate: 2023-08-28 19:27:50 +0000 librt: Hoist SHLIBDIR?= so it actually works src.opts.mk includes bsd.own.mk, which sets SHLIBDIR, so having this line after it does nothing. Hoist it like other libraries so it takes effect. Reported by: vishwin Fixes: 2964804ef95c ("librt: unbreak LIB32 build") --- lib/librt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librt/Makefile b/lib/librt/Makefile index 2c8eb1400fb9..c755bb123c73 100644 --- a/lib/librt/Makefile +++ b/lib/librt/Makefile @@ -1,9 +1,9 @@ +SHLIBDIR?=/lib .include PACKAGE=clibs LIB=rt -SHLIBDIR?=/lib SHLIB_MAJOR= 1 CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR} .ifndef NO_THREAD_STACK_UNWIND