From nobody Wed Dec 01 01:08:22 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 BDFCA18AE129; Wed, 1 Dec 2021 01:08:23 +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 4J3gvC0DYKz3sqS; Wed, 1 Dec 2021 01:08:23 +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 D7CAD205D7; Wed, 1 Dec 2021 01:08:22 +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 1B118MK3035697; Wed, 1 Dec 2021 01:08:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B118Mjs035696; Wed, 1 Dec 2021 01:08:22 GMT (envelope-from git) Date: Wed, 1 Dec 2021 01:08:22 GMT Message-Id: <202112010108.1B118Mjs035696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 46e032b0b123 - stable/13 - ldconfig(8): nostd/-s does nothing 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 46e032b0b123eee2c1ff896dfc474b7c9cf86ab7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638320903; 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=bl1nnj/r3FLvXz5hwDfdwMhEB+79wMeSvsmIdNd41II=; b=PTM4caQ1rDbjLfKEoEj6hDxMi+xoGXoMRoq65kIZG/zvMc7ZjXkAesiYTzOwtc5LfEkN0P LaqtsMEomS+JFIku/Svvc3qUiECosN1kWyjSW0HVaowWUXLnUJx6H92GuwvEJheex86RKb YA0iwEt04ydNOYf/kJBIGawyNIff6K2M2KJQpbakyjZa2OV7a8XGB9aPTUYSs8fZ4RD1GW k/Re+bwSxj7pUUG5Q3xsTY2f5R2z48PJOZY5n8xFaEQK8cT1SIRMyFR/zSfnOm9xu64ecw hZ1rk9AAxkOZRhRlhJng4hwYljE23pViw+u5OSyBGAPBZ+ffEF3B8rGwy+rwVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638320903; a=rsa-sha256; cv=none; b=dMBoel2ZO4Jb/NRhmEN+8dyceH5GaZNSVrBA2wqhsp+uz63fHViSwYXmpI3BgKRbu+DnQY mctG7GDtuSwMKOxGBxX9i+XN6lmVPXN0zpEdvlp/1Lrn6pEbLMd9cg27n/tuC5I4sIZfET JSviiUP5RhjBeP+9gosHw7UlL7uECeIBKqKYT9i3Lx97uQ15sihYm3R9yub0wQHt3hDiTJ 0hFKgc6kBDnwRfQ+qvpeg+UP3GCU1agzWCtvSlJAZT3o51zEGTZkgBmSh++2RgoaN1Vibh xI9v1RQ6xUG+PsjHWI55apO1GjnlIpC7frob7PNWJmiFkd/vv5aq2c3cif270Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=46e032b0b123eee2c1ff896dfc474b7c9cf86ab7 commit 46e032b0b123eee2c1ff896dfc474b7c9cf86ab7 Author: Konstantin Belousov AuthorDate: 2021-11-19 05:21:21 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-01 01:07:19 +0000 ldconfig(8): nostd/-s does nothing (cherry picked from commit b828161d123bec894bc5a320ef26d6afc9b13ae8) --- sbin/ldconfig/ldconfig.8 | 6 +----- sbin/ldconfig/ldconfig.c | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8 index 63e2271b7cd5..7718f018bc70 100644 --- a/sbin/ldconfig/ldconfig.8 +++ b/sbin/ldconfig/ldconfig.8 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .Nm .Op Fl 32 -.Op Fl Rimrsv +.Op Fl Rimrv .Op Fl f Ar hints_file .Op Ar directory | Ar .Sh DESCRIPTION @@ -128,10 +128,6 @@ on the standard output. The hints file is not modified. .Pp Scan and print all libraries found on the directories list. -.It Fl s -Do not scan the built-in system directory -.Pq Dq /usr/lib -for shared libraries. .It Fl v Switch on verbose mode. .El diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 3f623d6f38b1..777895936834 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -60,9 +60,9 @@ main(int argc, char **argv) { const char *hints_file; int c; - bool is_32, is_soft, justread, merge, nostd, rescan, verbose; + bool is_32, is_soft, justread, merge, rescan, verbose; - is_32 = is_soft = justread = merge = nostd = rescan = verbose = false; + is_32 = is_soft = justread = merge = rescan = verbose = false; while (argc > 1) { if (strcmp(argv[1], "-aout") == 0) { @@ -109,7 +109,7 @@ main(int argc, char **argv) justread = true; break; case 's': - nostd = true; + /* was nostd */ break; case 'v': verbose = true; @@ -132,7 +132,7 @@ static void usage(void) { fprintf(stderr, - "usage: ldconfig [-32] [-elf] [-Rimrsv] [-f hints_file] " + "usage: ldconfig [-32] [-elf] [-Rimrv] [-f hints_file] " "[directory | file ...]\n"); exit(1); }