NetBSD-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: misc/56416: build.sh -c clang fails (inappropriate distrib/sets/lists/ for clang 9?)
The following reply was made to PR misc/56416; it has been noted by GNATS.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc:
Subject: Re: misc/56416: build.sh -c clang fails (inappropriate
distrib/sets/lists/ for clang 9?)
Date: Thu, 23 Sep 2021 08:11:31 +0200
--owos3der3u7x6o3g
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Thu, Sep 23, 2021 at 05:55:00AM +0000, wataash%wataash.com@localhost wrote:
> >Number: 56416
> >Category: misc
> >Synopsis: build.sh -c clang fails (inappropriate distrib/sets/lists/ for clang 9?)
> >Confidential: no
> >Severity: serious
> >Priority: medium
> >Responsible: misc-bug-people
> >State: open
> >Class: sw-bug
> >Submitter-Id: net
> >Arrival-Date: Thu Sep 23 05:55:00 +0000 2021
> >Originator: Wataru Ashihara
> >Release: -current (2021-09-18 03:05:20)
I think this was fixed since then, perhaps through the attached
commit. Can you please try again?
Thomas
--owos3der3u7x6o3g
Content-Type: message/rfc822
Content-Disposition: inline
Return-Path: <bounces-source-changes-full-owner-wiz=NetBSD.org%NetBSD.org@localhost>
Delivered-To: wiz%gatalith.at@localhost
Received: from gatalith.at
by gatalith.at with LMTP
id zO6GM+ZBSmEQRAAA4iLUCg
(envelope-from <bounces-source-changes-full-owner-wiz=NetBSD.org%NetBSD.org@localhost>)
for <wiz%gatalith.at@localhost>; Tue, 21 Sep 2021 22:34:46 +0200
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
by gatalith.at (Postfix) with ESMTPS id D56393909F8
for <wiz%gatalith.at@localhost>; Tue, 21 Sep 2021 22:34:45 +0200 (CEST)
Received: by mail.netbsd.org (Postfix)
id 1976184ECC; Tue, 21 Sep 2021 20:34:41 +0000 (UTC)
Delivered-To: wiz%netbsd.org@localhost
Received: by mail.netbsd.org (Postfix, from userid 605)
id DB69B84EC6; Tue, 21 Sep 2021 20:34:40 +0000 (UTC)
Delivered-To: source-changes-full%NetBSD.org@localhost
Received: from localhost (localhost [127.0.0.1])
by mail.netbsd.org (Postfix) with ESMTP id 8052A84D12
for <source-changes-full%NetBSD.org@localhost>; Tue, 21 Sep 2021 20:34:39 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
with ESMTP id w2Nhzw0XbkTT for <source-changes-full%netbsd.org@localhost>;
Tue, 21 Sep 2021 20:34:38 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
by mail.netbsd.org (Postfix) with ESMTP id 92E2484EA1
for <source-changes-full%NetBSD.org@localhost>; Tue, 21 Sep 2021 20:34:38 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
id 86DC1FA98; Tue, 21 Sep 2021 20:34:38 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_163225647810370"
MIME-Version: 1.0
Date: Tue, 21 Sep 2021 16:34:38 -0400
From: "Christos Zoulas" <christos%netbsd.org@localhost>
Subject: CVS commit: src/external/bsd/compiler_rt
To: source-changes-full%NetBSD.org@localhost
X-Mailer: log_accum
Message-Id: <20210921203438.86DC1FA98%cvs.NetBSD.org@localhost>
Sender: source-changes-full-owner%NetBSD.org@localhost
List-Id: <source-changes-full.NetBSD.org>
Precedence: bulk
Reply-To: source-changes-d%NetBSD.org@localhost
Mail-Reply-To: "Christos Zoulas" <christos%netbsd.org@localhost>
Mail-Followup-To: source-changes-d%NetBSD.org@localhost
List-Unsubscribe: <mailto:majordomo%NetBSD.org@localhost?subject=Unsubscribe%20source-changes-full&body=unsubscribe%20source-changes-full>
This is a multi-part message in MIME format.
--_----------=_163225647810370
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
Module Name: src
Committed By: christos
Date: Tue Sep 21 20:34:38 UTC 2021
Modified Files:
src/external/bsd/compiler_rt/lib/clang/include/sanitizer: Makefile
src/external/bsd/compiler_rt/lib/clang/include/xray: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd: common.mk
src/external/bsd/compiler_rt/lib/clang/share: Makefile
Added Files:
src/external/bsd/compiler_rt: Makefile.inc
src/external/bsd/compiler_rt/lib: Makefile.inc
src/external/bsd/compiler_rt/lib/clang: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/include: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/lib: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/lib/netbsd: Makefile.inc
Log Message:
centralize version handling
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/compiler_rt/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/compiler_rt/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/compiler_rt/lib/clang/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/compiler_rt/lib/clang/include/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/compiler_rt/lib/clang/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/compiler_rt/lib/clang/share/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
--_----------=_163225647810370
Content-Disposition: inline
Content-Length: 6028
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii
Modified files:
Index: src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile:1.3 Fri Feb 7 14:00:10 2020
+++ src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile Tue Sep 21 16:34:37 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2020/02/07 19:00:10 kamil Exp $
-
-TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+# $NetBSD: Makefile,v 1.4 2021/09/21 20:34:37 christos Exp $
NOOBJ= # defined
+.include <bsd.init.mk>
+
.PATH: ${TOPDIR}/include/sanitizer
INCS+= allocator_interface.h
@@ -20,8 +20,6 @@ INCS+= netbsd_syscall_hooks.h
INCS+= tsan_interface.h
INCS+= tsan_interface_atomic.h
-.include <bsd.own.mk>
-
-INCSDIR= /usr/lib/clang/9.0.0/include/sanitizer
+INCSDIR= /usr/lib/clang/${CLANG_VER}/include/sanitizer
.include <bsd.prog.mk>
Index: src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile:1.2 src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile:1.3
--- src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile:1.2 Fri Feb 7 14:00:10 2020
+++ src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile Tue Sep 21 16:34:37 2021
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2020/02/07 19:00:10 kamil Exp $
-
-TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+# $NetBSD: Makefile,v 1.3 2021/09/21 20:34:37 christos Exp $
NOOBJ= # defined
+.include <bsd.init.mk>
+
.PATH: ${TOPDIR}/include/xray
INCS+= xray_interface.h
INCS+= xray_log_interface.h
INCS+= xray_records.h
-.include <bsd.own.mk>
-
-INCSDIR= /usr/lib/clang/9.0.0/include/xray
+INCSDIR= /usr/lib/clang/${CLANG_VER}/include/xray
.include <bsd.prog.mk>
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk:1.6 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk:1.7
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk:1.6 Thu Sep 16 22:18:01 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk Tue Sep 21 16:34:38 2021
@@ -1,12 +1,7 @@
-# $NetBSD: common.mk,v 1.6 2021/09/17 02:18:01 christos Exp $
+# $NetBSD: common.mk,v 1.7 2021/09/21 20:34:38 christos Exp $
NOSANITIZER= # defined
NODEBUG= # defined
NOLIBCSANITIZER=# defined
-.include <bsd.own.mk>
-
-TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
-CLANG_VER!= cd ${NETBSDSRCDIR}/external/apache2/llvm && \
- ${MAKE} -V LLVM_VERSION
+.include <bsd.init.mk>
Index: src/external/bsd/compiler_rt/lib/clang/share/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/share/Makefile:1.2 src/external/bsd/compiler_rt/lib/clang/share/Makefile:1.3
--- src/external/bsd/compiler_rt/lib/clang/share/Makefile:1.2 Fri Feb 7 14:00:10 2020
+++ src/external/bsd/compiler_rt/lib/clang/share/Makefile Tue Sep 21 16:34:38 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/02/07 19:00:10 kamil Exp $
-
-TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+# $NetBSD: Makefile,v 1.3 2021/09/21 20:34:38 christos Exp $
NOOBJ= # defined
+.include <bsd.init.mk>
.PATH: ${TOPDIR}/lib/asan
INCS+= asan_blacklist.txt
@@ -10,8 +9,6 @@ INCS+= asan_blacklist.txt
.PATH: ${TOPDIR}/lib/msan
INCS+= msan_blacklist.txt
-.include <bsd.own.mk>
-
-INCSDIR= /usr/lib/clang/9.0.0/share
+INCSDIR= /usr/lib/clang/${CLANG_VER}/share
.include <bsd.prog.mk>
Added files:
Index: src/external/bsd/compiler_rt/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/Makefile.inc Tue Sep 21 16:34:37 2021
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+
+TOPDIR:= ${.PARSEDIR}/../../../sys/external/bsd/compiler_rt/dist
+COMPILER_RT:= ${.PARSEDIR}
+
+CLANG_VER!= cd ${COMPILER_RT}/../../apache2/llvm && ${MAKE} -V LLVM_VERSION
Index: src/external/bsd/compiler_rt/lib/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/Makefile.inc Tue Sep 21 16:34:37 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/compiler_rt/lib/clang/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/clang/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/clang/Makefile.inc Tue Sep 21 16:34:37 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/compiler_rt/lib/clang/include/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/clang/include/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/clang/include/Makefile.inc Tue Sep 21 16:34:37 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/compiler_rt/lib/clang/lib/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/clang/lib/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/Makefile.inc Tue Sep 21 16:34:38 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:38 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc Tue Sep 21 16:34:38 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:38 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
--_----------=_163225647810370--
--owos3der3u7x6o3g--
Home |
Main Index |
Thread Index |
Old Index