From: robert <robert@openbsd.org>
Date: Wed, 23 Mar 2022 14:23:44 +0000 (+0000)
Subject: use llvm-ranlib where llvm-ar is used so that they are in line with each
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=afab9586905475978573196607c278ffe389a127;p=openbsd

use llvm-ranlib where llvm-ar is used so that they are in line with each
other
---

diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
index 903a2a39e6f..8682d58cbd1 100644
--- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.27 2022/02/17 16:28:37 phessler Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.28 2022/03/23 14:23:44 robert Exp $
 
 .include <bsd.own.mk>
 
@@ -29,8 +29,7 @@ MAN=		binutils/doc/addr2line.1 binutils/doc/objcopy.1 \
 SUBDIRS+=	binutils
 CONF_SUBDIRS+=	binutils
 INST_SUBDIRS+=	binutils
-MAN+=		binutils/doc/ranlib.1 \
-		binutils/doc/strings.1 binutils/doc/strip.1
+MAN+=		binutils/doc/strings.1 binutils/doc/strip.1
 
 .if (${TARGET_ARCH} != "aarch64" && ${TARGET_ARCH} != "powerpc64" && \
     ${TARGET_ARCH} != "riscv64")
@@ -41,10 +40,10 @@ MAN+=		gas/doc/as.1	ld/ld.bfd.1
 .endif
 
 .if ${AR_VERSION:L} == "binutils"
-MAN+=		binutils/doc/ar.1
+MAN+=		binutils/doc/ar.1 binutils/doc/ranlib.1
 .else
-# skip installing ar(1) which is am__EXEEXT_7
-SKIP_AR=	am__EXEEXT_7=
+# skip installing ar(1) and ranlib(1) which is am__EXEEXT_7 and am__EXEEXT_9
+SKIP_AR=	am__EXEEXT_7= am__EXEEXT_9=
 .endif
 
 .if ${LINKER_VERSION:L} == "bfd"
diff --git a/gnu/usr.bin/clang/llvm-ar/Makefile b/gnu/usr.bin/clang/llvm-ar/Makefile
index 9557d927fb5..8301c65297a 100644
--- a/gnu/usr.bin/clang/llvm-ar/Makefile
+++ b/gnu/usr.bin/clang/llvm-ar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2021/11/24 15:15:19 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2022/03/23 14:23:44 robert Exp $
 
 PROG=	ar
 BINDIR=	/usr/bin
@@ -7,6 +7,9 @@ BINDIR=	/usr/bin
 
 SRCS=	llvm-ar.cpp
 
+LINKS=	${BINDIR}/ar ${BINDIR}/ranlib
+MAN+=	ranlib.1
+
 .PATH:	${.CURDIR}/../../../llvm/llvm/tools/llvm-ar
 
 LLVM_LIBDEPS=	LLVM LLVMDlltoolDriver LLVMLibDriver
diff --git a/gnu/usr.bin/clang/llvm-ar/ranlib.1 b/gnu/usr.bin/clang/llvm-ar/ranlib.1
new file mode 100644
index 00000000000..6a287b7b28e
--- /dev/null
+++ b/gnu/usr.bin/clang/llvm-ar/ranlib.1
@@ -0,0 +1,51 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "LLVM-RANLIB" "1" "2021-11-13" "11" "LLVM"
+.SH NAME
+llvm-ranlib \- generates an archive index
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBllvm\-ranlib\fP [\fIoptions\fP]
+.SH DESCRIPTION
+.sp
+\fBllvm\-ranlib\fP is an alias for the llvm\-ar tool that
+generates an index for an archive. It can be used as a replacement for GNU\(aqs
+\fBranlib\fP tool.
+.sp
+Running \fBllvm\-ranlib\fP is equivalent to running \fBllvm\-ar s\fP\&.
+.SH SEE ALSO
+.sp
+\fBllvm\-ar(1)\fP
+.SH AUTHOR
+Maintained by the LLVM Team (https://llvm.org/).
+.SH COPYRIGHT
+2003-2021, LLVM Project
+.\" Generated by docutils manpage writer.
+.