* [PR PATCH] clang: add missing file for scan-view
@ 2021-09-16 10:18 Gottox
2021-09-16 14:11 ` q66
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: Gottox @ 2021-09-16 10:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1113 bytes --]
There is a new pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages clang-analyzer-fix-scan-view
https://github.com/void-linux/void-packages/pull/32978
clang: add missing file for scan-view
This PR fixes an issue with current clang-analyzer where it fails to start the scan-view webinterface:
```
scan-view /tmp/scan-build-2021-09-16-111211-22764-1
/usr/bin/scan-view:9: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses
import imp
Traceback (most recent call last):
File "/usr/bin/scan-view", line 150, in <module>
main()
File "/usr/bin/scan-view", line 147, in main
run(port, args, args.root)
File "/usr/bin/scan-view", line 74, in run
import ScanView
File "/usr/bin/../share/scan-view/ScanView.py", line 29, in <module>
import Reporter
ModuleNotFoundError: No module named 'Reporter'
```
Upstream context: https://reviews.llvm.org/D96367
A patch file from https://github.com/void-linux/void-packages/pull/32978.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-clang-analyzer-fix-scan-view-32978.patch --]
[-- Type: text/x-diff, Size: 8743 bytes --]
From cd73064dc0d387c2d51f69564536bb9fab5a9175 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 16 Sep 2021 12:02:50 +0200
Subject: [PATCH] clang: add missing file for scan-view
---
.../patches/clang-analyzer-add-reporter.patch | 223 ++++++++++++++++++
srcpkgs/llvm12/template | 2 +-
2 files changed, 224 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/llvm12/patches/clang-analyzer-add-reporter.patch
diff --git a/srcpkgs/llvm12/patches/clang-analyzer-add-reporter.patch b/srcpkgs/llvm12/patches/clang-analyzer-add-reporter.patch
new file mode 100644
index 000000000000..325006ac4391
--- /dev/null
+++ b/srcpkgs/llvm12/patches/clang-analyzer-add-reporter.patch
@@ -0,0 +1,223 @@
+From e3cd3a3c91524c957e06bb0170343548f02b6842 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Thu, 11 Feb 2021 22:28:19 +0000
+Subject: [PATCH] Partially Revert "scan-view: Remove Reporter.py and
+ associated AppleScript files"
+
+This reverts some of commit dbb01536f6f49fa428f170e34466072ef439b3e9.
+
+The Reporter module was still being used by the ScanView.py module and deleting
+it caused scan-view to fail. This commit adds back Reporter.py but removes the
+code the references the AppleScript files which were removed in
+dbb01536f6f49fa428f170e34466072ef439b3e9.
+
+Reviewed By: NoQ
+
+Differential Revision: https://reviews.llvm.org/D96367
+---
+ clang/tools/scan-view/CMakeLists.txt | 1 +
+ clang/tools/scan-view/share/Reporter.py | 183 ++++++++++++++++++++++++
+ 2 files changed, 184 insertions(+)
+ create mode 100644 clang/tools/scan-view/share/Reporter.py
+
+diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
+index dd3d33439299a..eccc6b83195b6 100644
+--- a/clang/tools/scan-view/CMakeLists.txt
++++ b/clang/tools/scan-view/CMakeLists.txt
+@@ -5,6 +5,7 @@ set(BinFiles
+
+ set(ShareFiles
+ ScanView.py
++ Reporter.py
+ startfile.py
+ bugcatcher.ico)
+
+diff --git a/clang/tools/scan-view/share/Reporter.py b/clang/tools/scan-view/share/Reporter.py
+new file mode 100644
+index 0000000000000..31a14fb0cf74e
+--- /dev/null
++++ b/clang/tools/scan-view/share/Reporter.py
+@@ -0,0 +1,183 @@
++#!/usr/bin/env python
++# -*- coding: utf-8 -*-
++
++"""Methods for reporting bugs."""
++
++import subprocess, sys, os
++
++__all__ = ['ReportFailure', 'BugReport', 'getReporters']
++
++#
++
++class ReportFailure(Exception):
++ """Generic exception for failures in bug reporting."""
++ def __init__(self, value):
++ self.value = value
++
++# Collect information about a bug.
++
++class BugReport(object):
++ def __init__(self, title, description, files):
++ self.title = title
++ self.description = description
++ self.files = files
++
++# Reporter interfaces.
++
++import os
++
++import email, mimetypes, smtplib
++from email import encoders
++from email.message import Message
++from email.mime.base import MIMEBase
++from email.mime.multipart import MIMEMultipart
++from email.mime.text import MIMEText
++
++#===------------------------------------------------------------------------===#
++# ReporterParameter
++#===------------------------------------------------------------------------===#
++
++class ReporterParameter(object):
++ def __init__(self, n):
++ self.name = n
++ def getName(self):
++ return self.name
++ def getValue(self,r,bugtype,getConfigOption):
++ return getConfigOption(r.getName(),self.getName())
++ def saveConfigValue(self):
++ return True
++
++class TextParameter (ReporterParameter):
++ def getHTML(self,r,bugtype,getConfigOption):
++ return """\
++<tr>
++<td class="form_clabel">%s:</td>
++<td class="form_value"><input type="text" name="%s_%s" value="%s"></td>
++</tr>"""%(self.getName(),r.getName(),self.getName(),self.getValue(r,bugtype,getConfigOption))
++
++class SelectionParameter (ReporterParameter):
++ def __init__(self, n, values):
++ ReporterParameter.__init__(self,n)
++ self.values = values
++
++ def getHTML(self,r,bugtype,getConfigOption):
++ default = self.getValue(r,bugtype,getConfigOption)
++ return """\
++<tr>
++<td class="form_clabel">%s:</td><td class="form_value"><select name="%s_%s">
++%s
++</select></td>"""%(self.getName(),r.getName(),self.getName(),'\n'.join(["""\
++<option value="%s"%s>%s</option>"""%(o[0],
++ o[0] == default and ' selected="selected"' or '',
++ o[1]) for o in self.values]))
++
++#===------------------------------------------------------------------------===#
++# Reporters
++#===------------------------------------------------------------------------===#
++
++class EmailReporter(object):
++ def getName(self):
++ return 'Email'
++
++ def getParameters(self):
++ return [TextParameter(x) for x in ['To', 'From', 'SMTP Server', 'SMTP Port']]
++
++ # Lifted from python email module examples.
++ def attachFile(self, outer, path):
++ # Guess the content type based on the file's extension. Encoding
++ # will be ignored, although we should check for simple things like
++ # gzip'd or compressed files.
++ ctype, encoding = mimetypes.guess_type(path)
++ if ctype is None or encoding is not None:
++ # No guess could be made, or the file is encoded (compressed), so
++ # use a generic bag-of-bits type.
++ ctype = 'application/octet-stream'
++ maintype, subtype = ctype.split('/', 1)
++ if maintype == 'text':
++ fp = open(path)
++ # Note: we should handle calculating the charset
++ msg = MIMEText(fp.read(), _subtype=subtype)
++ fp.close()
++ else:
++ fp = open(path, 'rb')
++ msg = MIMEBase(maintype, subtype)
++ msg.set_payload(fp.read())
++ fp.close()
++ # Encode the payload using Base64
++ encoders.encode_base64(msg)
++ # Set the filename parameter
++ msg.add_header('Content-Disposition', 'attachment', filename=os.path.basename(path))
++ outer.attach(msg)
++
++ def fileReport(self, report, parameters):
++ mainMsg = """\
++BUG REPORT
++---
++Title: %s
++Description: %s
++"""%(report.title, report.description)
++
++ if not parameters.get('To'):
++ raise ReportFailure('No "To" address specified.')
++ if not parameters.get('From'):
++ raise ReportFailure('No "From" address specified.')
++
++ msg = MIMEMultipart()
++ msg['Subject'] = 'BUG REPORT: %s'%(report.title)
++ # FIXME: Get config parameters
++ msg['To'] = parameters.get('To')
++ msg['From'] = parameters.get('From')
++ msg.preamble = mainMsg
++
++ msg.attach(MIMEText(mainMsg, _subtype='text/plain'))
++ for file in report.files:
++ self.attachFile(msg, file)
++
++ try:
++ s = smtplib.SMTP(host=parameters.get('SMTP Server'),
++ port=parameters.get('SMTP Port'))
++ s.sendmail(msg['From'], msg['To'], msg.as_string())
++ s.close()
++ except:
++ raise ReportFailure('Unable to send message via SMTP.')
++
++ return "Message sent!"
++
++class BugzillaReporter(object):
++ def getName(self):
++ return 'Bugzilla'
++
++ def getParameters(self):
++ return [TextParameter(x) for x in ['URL','Product']]
++
++ def fileReport(self, report, parameters):
++ raise NotImplementedError
++
++
++class RadarClassificationParameter(SelectionParameter):
++ def __init__(self):
++ SelectionParameter.__init__(self,"Classification",
++ [['1', 'Security'], ['2', 'Crash/Hang/Data Loss'],
++ ['3', 'Performance'], ['4', 'UI/Usability'],
++ ['6', 'Serious Bug'], ['7', 'Other']])
++
++ def saveConfigValue(self):
++ return False
++
++ def getValue(self,r,bugtype,getConfigOption):
++ if bugtype.find("leak") != -1:
++ return '3'
++ elif bugtype.find("dereference") != -1:
++ return '2'
++ elif bugtype.find("missing ivar release") != -1:
++ return '3'
++ else:
++ return '7'
++
++###
++
++def getReporters():
++ reporters = []
++ reporters.append(EmailReporter())
++ return reporters
++
diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template
index 86a8c6d10791..05845b022fc2 100644
--- a/srcpkgs/llvm12/template
+++ b/srcpkgs/llvm12/template
@@ -1,7 +1,7 @@
# Template file for 'llvm12'
pkgname=llvm12
version=12.0.0
-revision=3
+revision=4
wrksrc="llvm-project-${version}.src"
build_wrksrc=llvm
build_style=cmake
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
@ 2021-09-16 14:11 ` q66
2021-09-17 6:03 ` [PR PATCH] [Updated] " Gottox
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: q66 @ 2021-09-16 14:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/32978#issuecomment-920939220
Comment:
update llvm while you're at it
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
2021-09-16 14:11 ` q66
@ 2021-09-17 6:03 ` Gottox
2021-09-17 6:04 ` Gottox
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gottox @ 2021-09-17 6:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages clang-analyzer-fix-scan-view
https://github.com/void-linux/void-packages/pull/32978
clang: add missing file for scan-view
This PR fixes an issue with current clang-analyzer where it fails to start the scan-view webinterface:
```
scan-view /tmp/scan-build-2021-09-16-111211-22764-1
/usr/bin/scan-view:9: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses
import imp
Traceback (most recent call last):
File "/usr/bin/scan-view", line 150, in <module>
main()
File "/usr/bin/scan-view", line 147, in main
run(port, args, args.root)
File "/usr/bin/scan-view", line 74, in run
import ScanView
File "/usr/bin/../share/scan-view/ScanView.py", line 29, in <module>
import Reporter
ModuleNotFoundError: No module named 'Reporter'
```
Upstream context: https://reviews.llvm.org/D96367
A patch file from https://github.com/void-linux/void-packages/pull/32978.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-clang-analyzer-fix-scan-view-32978.patch --]
[-- Type: text/x-diff, Size: 12189 bytes --]
From 0b18e3d227d25cf94e5a08016068e29e81482ad1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 16 Sep 2021 12:02:50 +0200
Subject: [PATCH] llvm12: update to 12.0.1.
---
...clang-001-fix-unwind-chain-inclusion.patch | 44 -------
.../patches/clang-002-add-musl-triples.patch | 110 ------------------
.../clang-003-ppc64-dynamic-linker-path.patch | 13 ---
.../patches/clang-004-ppc64-musl-elfv2.patch | 48 --------
srcpkgs/llvm12/template | 6 +-
5 files changed, 3 insertions(+), 218 deletions(-)
delete mode 100644 srcpkgs/llvm12/patches/clang-001-fix-unwind-chain-inclusion.patch
delete mode 100644 srcpkgs/llvm12/patches/clang-002-add-musl-triples.patch
delete mode 100644 srcpkgs/llvm12/patches/clang-003-ppc64-dynamic-linker-path.patch
delete mode 100644 srcpkgs/llvm12/patches/clang-004-ppc64-musl-elfv2.patch
diff --git a/srcpkgs/llvm12/patches/clang-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm12/patches/clang-001-fix-unwind-chain-inclusion.patch
deleted file mode 100644
index e4eaa7783e7a..000000000000
--- a/srcpkgs/llvm12/patches/clang-001-fix-unwind-chain-inclusion.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <miwaxe@gmail.com>
-Date: Tue, 8 Sep 2015 22:14:57 +0200
-Subject: [PATCH 2/7] fix unwind chain inclusion
-
----
- lib/Headers/unwind.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h
-index 303d792..44e10cc 100644
---- a/clang/lib/Headers/unwind.h
-+++ b/clang/lib/Headers/unwind.h
-@@ -9,9 +9,6 @@
-
- /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
-
--#ifndef __CLANG_UNWIND_H
--#define __CLANG_UNWIND_H
--
- #if defined(__APPLE__) && __has_include_next(<unwind.h>)
- /* Darwin (from 11.x on) provide an unwind.h. If that's available,
- * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
-@@ -39,6 +36,9 @@
- # endif
- #else
-
-+#ifndef __CLANG_UNWIND_H
-+#define __CLANG_UNWIND_H
-+
- #include <stdint.h>
-
- #ifdef __cplusplus
-@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *);
- }
- #endif
-
-+#endif /* __CLANG_UNWIND_H */
-+
- #endif
-
--#endif /* __CLANG_UNWIND_H */
---
-2.5.1
diff --git a/srcpkgs/llvm12/patches/clang-002-add-musl-triples.patch b/srcpkgs/llvm12/patches/clang-002-add-musl-triples.patch
deleted file mode 100644
index 25688d40dbc2..000000000000
--- a/srcpkgs/llvm12/patches/clang-002-add-musl-triples.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2086,7 +2086,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
- static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
- "armv7hl-redhat-linux-gnueabi",
- "armv6hl-suse-linux-gnueabi",
-- "armv7hl-suse-linux-gnueabi"};
-+ "armv7hl-suse-linux-gnueabi",
-+ "armv7l-linux-gnueabihf"};
- static const char *const ARMebLibDirs[] = {"/lib"};
- static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
- "armeb-linux-androideabi"};
-@@ -2153,8 +2154,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
- "powerpc64-suse-linux", "powerpc-montavista-linuxspe"};
- static const char *const PPCLELibDirs[] = {"/lib32", "/lib"};
- static const char *const PPCLETriples[] = {"powerpcle-linux-gnu",
-- "powerpcle-unknown-linux-gnu",
-- "powerpcle-linux-musl"};
-+ "powerpcle-unknown-linux-gnu"};
-
- static const char *const PPC64LibDirs[] = {"/lib64", "/lib"};
- static const char *const PPC64Triples[] = {
-@@ -2235,6 +2235,87 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
- return;
- }
-
-+ if (TargetTriple.isMusl()) {
-+ static const char *const AArch64MuslTriples[] = {"aarch64-linux-musl"};
-+ static const char *const ARMHFMuslTriples[] = {
-+ "arm-linux-musleabihf", "armv7l-linux-musleabihf"
-+ };
-+ static const char *const ARMMuslTriples[] = {"arm-linux-musleabi"};
-+ static const char *const X86_64MuslTriples[] = {"x86_64-linux-musl"};
-+ static const char *const X86MuslTriples[] = {"i686-linux-musl"};
-+ static const char *const MIPSMuslTriples[] = {
-+ "mips-linux-musl", "mipsel-linux-musl",
-+ "mipsel-linux-muslhf", "mips-linux-muslhf"
-+ };
-+ static const char *const PPCMuslTriples[] = {"powerpc-linux-musl"};
-+ static const char *const PPCLEMuslTriples[] = {"powerpcle-linux-musl"};
-+ static const char *const PPC64MuslTriples[] = {"powerpc64-linux-musl"};
-+ static const char *const PPC64LEMuslTriples[] = {"powerpc64le-linux-musl"};
-+
-+ switch (TargetTriple.getArch()) {
-+ case llvm::Triple::aarch64:
-+ LibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
-+ TripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
-+ BiarchLibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
-+ BiarchTripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
-+ break;
-+ case llvm::Triple::arm:
-+ LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
-+ if (TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
-+ TripleAliases.append(begin(ARMHFMuslTriples), end(ARMHFMuslTriples));
-+ } else {
-+ TripleAliases.append(begin(ARMMuslTriples), end(ARMMuslTriples));
-+ }
-+ break;
-+ case llvm::Triple::x86_64:
-+ LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
-+ TripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
-+ BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
-+ BiarchTripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
-+ break;
-+ case llvm::Triple::x86:
-+ LibDirs.append(begin(X86LibDirs), end(X86LibDirs));
-+ TripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
-+ BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
-+ BiarchTripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
-+ break;
-+ case llvm::Triple::mips:
-+ LibDirs.append(begin(MIPSLibDirs), end(MIPSLibDirs));
-+ TripleAliases.append(begin(MIPSMuslTriples), end(MIPSMuslTriples));
-+ break;
-+ case llvm::Triple::ppc:
-+ LibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
-+ TripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
-+ BiarchLibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
-+ BiarchTripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
-+ break;
-+ case llvm::Triple::ppcle:
-+ LibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs));
-+ TripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples));
-+ BiarchLibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs));
-+ BiarchTripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples));
-+ break;
-+ case llvm::Triple::ppc64:
-+ LibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
-+ TripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
-+ BiarchLibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
-+ BiarchTripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
-+ break;
-+ case llvm::Triple::ppc64le:
-+ LibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs));
-+ TripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples));
-+ BiarchLibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs));
-+ BiarchTripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples));
-+ break;
-+ default:
-+ break;
-+ }
-+ TripleAliases.push_back(TargetTriple.str());
-+ if (TargetTriple.str() != BiarchTriple.str())
-+ BiarchTripleAliases.push_back(BiarchTriple.str());
-+ return;
-+ }
-+
- // Android targets should not use GNU/Linux tools or libraries.
- if (TargetTriple.isAndroid()) {
- static const char *const AArch64AndroidTriples[] = {
diff --git a/srcpkgs/llvm12/patches/clang-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm12/patches/clang-003-ppc64-dynamic-linker-path.patch
deleted file mode 100644
index 4ad6412d1e6c..000000000000
--- a/srcpkgs/llvm12/patches/clang-003-ppc64-dynamic-linker-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -504,10 +504,6 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
- Loader = "ld.so.1";
- break;
- case llvm::Triple::ppc64:
-- LibDir = "lib64";
-- Loader =
-- (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
-- break;
- case llvm::Triple::ppc64le:
- LibDir = "lib64";
- Loader =
diff --git a/srcpkgs/llvm12/patches/clang-004-ppc64-musl-elfv2.patch b/srcpkgs/llvm12/patches/clang-004-ppc64-musl-elfv2.patch
deleted file mode 100644
index 21fc8003c5f1..000000000000
--- a/srcpkgs/llvm12/patches/clang-004-ppc64-musl-elfv2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/clang/lib/Basic/Targets/PPC.h
-+++ b/clang/lib/Basic/Targets/PPC.h
-@@ -415,11 +415,10 @@ public:
- LongDoubleFormat = &llvm::APFloat::IEEEdouble();
- } else if ((Triple.getArch() == llvm::Triple::ppc64le)) {
- DataLayout = "e-m:e-i64:64-n32:64";
-- ABI = "elfv2";
- } else {
- DataLayout = "E-m:e-i64:64-n32:64";
-- ABI = "elfv1";
- }
-+ ABI = "elfv2";
-
- if (Triple.isOSFreeBSD() || Triple.isOSOpenBSD() || Triple.isMusl()) {
- LongDoubleWidth = LongDoubleAlign = 64;
---- a/clang/lib/CodeGen/TargetInfo.cpp
-+++ b/clang/lib/CodeGen/TargetInfo.cpp
-@@ -10927,9 +10927,9 @@ const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() {
- return SetCGInfo(new AIXTargetCodeGenInfo(Types, /*Is64Bit*/ true));
-
- if (Triple.isOSBinFormatELF()) {
-- PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv1;
-- if (getTarget().getABI() == "elfv2")
-- Kind = PPC64_SVR4_ABIInfo::ELFv2;
-+ PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv2;
-+ if (getTarget().getABI() == "elfv1")
-+ Kind = PPC64_SVR4_ABIInfo::ELFv1;
- bool IsSoftFloat = CodeGenOpts.FloatABI == "soft";
-
- return SetCGInfo(
---- a/clang/lib/Driver/ToolChains/Clang.cpp
-+++ b/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -1920,14 +1920,7 @@ void Clang::AddPPCTargetArgs(const ArgList &Args,
- const llvm::Triple &T = getToolChain().getTriple();
- if (T.isOSBinFormatELF()) {
- switch (getToolChain().getArch()) {
-- case llvm::Triple::ppc64: {
-- if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) ||
-- T.isOSOpenBSD() || T.isMusl())
-- ABIName = "elfv2";
-- else
-- ABIName = "elfv1";
-- break;
-- }
-+ case llvm::Triple::ppc64:
- case llvm::Triple::ppc64le:
- ABIName = "elfv2";
- break;
diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template
index 86a8c6d10791..b4aa30e6d39d 100644
--- a/srcpkgs/llvm12/template
+++ b/srcpkgs/llvm12/template
@@ -1,7 +1,7 @@
# Template file for 'llvm12'
pkgname=llvm12
-version=12.0.0
-revision=3
+version=12.0.1
+revision=1
wrksrc="llvm-project-${version}.src"
build_wrksrc=llvm
build_style=cmake
@@ -35,7 +35,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="Apache-2.0"
homepage="https://www.llvm.org"
distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz"
-checksum="9ed1688943a4402d7c904cc4515798cdb20080066efa010fe7e1f2551b423628"
+checksum=129cb25cd13677aad951ce5c2deb0fe4afc1e9d98950f53b51bdcfb5a73afa0e
lib32disabled=yes
python_version=3
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
2021-09-16 14:11 ` q66
2021-09-17 6:03 ` [PR PATCH] [Updated] " Gottox
@ 2021-09-17 6:04 ` Gottox
2021-09-17 10:12 ` q66
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gottox @ 2021-09-17 6:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 149 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/32978#issuecomment-921523368
Comment:
@q66 done
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
` (2 preceding siblings ...)
2021-09-17 6:04 ` Gottox
@ 2021-09-17 10:12 ` q66
2021-09-18 7:59 ` Gottox
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: q66 @ 2021-09-17 10:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/32978#issuecomment-921678786
Comment:
what's up with these patch removals?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
` (3 preceding siblings ...)
2021-09-17 10:12 ` q66
@ 2021-09-18 7:59 ` Gottox
2021-09-18 8:39 ` [PR PATCH] [Updated] " Gottox
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gottox @ 2021-09-18 7:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/32978#issuecomment-922236594
Comment:
patch reported them to be already applied, but I wanted you to check.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
` (4 preceding siblings ...)
2021-09-18 7:59 ` Gottox
@ 2021-09-18 8:39 ` Gottox
2021-09-18 8:39 ` Gottox
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gottox @ 2021-09-18 8:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages clang-analyzer-fix-scan-view
https://github.com/void-linux/void-packages/pull/32978
clang: add missing file for scan-view
This PR fixes an issue with current clang-analyzer where it fails to start the scan-view webinterface:
```
scan-view /tmp/scan-build-2021-09-16-111211-22764-1
/usr/bin/scan-view:9: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses
import imp
Traceback (most recent call last):
File "/usr/bin/scan-view", line 150, in <module>
main()
File "/usr/bin/scan-view", line 147, in main
run(port, args, args.root)
File "/usr/bin/scan-view", line 74, in run
import ScanView
File "/usr/bin/../share/scan-view/ScanView.py", line 29, in <module>
import Reporter
ModuleNotFoundError: No module named 'Reporter'
```
Upstream context: https://reviews.llvm.org/D96367
A patch file from https://github.com/void-linux/void-packages/pull/32978.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-clang-analyzer-fix-scan-view-32978.patch --]
[-- Type: text/x-diff, Size: 1067 bytes --]
From f9aa30a7b18fc4dbdb7519a71230b18c1b39eefe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 16 Sep 2021 12:02:50 +0200
Subject: [PATCH] llvm12: update to 12.0.1.
---
srcpkgs/llvm12/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template
index 86a8c6d10791..b4aa30e6d39d 100644
--- a/srcpkgs/llvm12/template
+++ b/srcpkgs/llvm12/template
@@ -1,7 +1,7 @@
# Template file for 'llvm12'
pkgname=llvm12
-version=12.0.0
-revision=3
+version=12.0.1
+revision=1
wrksrc="llvm-project-${version}.src"
build_wrksrc=llvm
build_style=cmake
@@ -35,7 +35,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="Apache-2.0"
homepage="https://www.llvm.org"
distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz"
-checksum="9ed1688943a4402d7c904cc4515798cdb20080066efa010fe7e1f2551b423628"
+checksum=129cb25cd13677aad951ce5c2deb0fe4afc1e9d98950f53b51bdcfb5a73afa0e
lib32disabled=yes
python_version=3
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
` (5 preceding siblings ...)
2021-09-18 8:39 ` [PR PATCH] [Updated] " Gottox
@ 2021-09-18 8:39 ` Gottox
2021-09-18 14:46 ` q66
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gottox @ 2021-09-18 8:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/32978#issuecomment-922236594
Comment:
~patch reported them to be already applied, but I wanted you to check.~
This was a fuckup at my end. Corrected.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
` (6 preceding siblings ...)
2021-09-18 8:39 ` Gottox
@ 2021-09-18 14:46 ` q66
2021-09-19 16:01 ` Gottox
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: q66 @ 2021-09-18 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/32978#issuecomment-922315871
Comment:
now it's missing whatever you opened your PR for in the first place
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
` (7 preceding siblings ...)
2021-09-18 14:46 ` q66
@ 2021-09-19 16:01 ` Gottox
2021-09-21 10:26 ` q66
2021-09-22 0:06 ` [PR PATCH] [Closed]: " q66
10 siblings, 0 replies; 12+ messages in thread
From: Gottox @ 2021-09-19 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/32978#issuecomment-922496550
Comment:
That's right, the patch was release with .1.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
` (8 preceding siblings ...)
2021-09-19 16:01 ` Gottox
@ 2021-09-21 10:26 ` q66
2021-09-22 0:06 ` [PR PATCH] [Closed]: " q66
10 siblings, 0 replies; 12+ messages in thread
From: q66 @ 2021-09-21 10:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/32978#issuecomment-923845856
Comment:
i see, gonna merge it later then
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Closed]: clang: add missing file for scan-view
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
` (9 preceding siblings ...)
2021-09-21 10:26 ` q66
@ 2021-09-22 0:06 ` q66
10 siblings, 0 replies; 12+ messages in thread
From: q66 @ 2021-09-22 0:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 943 bytes --]
There's a closed pull request on the void-packages repository
clang: add missing file for scan-view
https://github.com/void-linux/void-packages/pull/32978
Description:
This PR fixes an issue with current clang-analyzer where it fails to start the scan-view webinterface:
```
scan-view /tmp/scan-build-2021-09-16-111211-22764-1
/usr/bin/scan-view:9: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses
import imp
Traceback (most recent call last):
File "/usr/bin/scan-view", line 150, in <module>
main()
File "/usr/bin/scan-view", line 147, in main
run(port, args, args.root)
File "/usr/bin/scan-view", line 74, in run
import ScanView
File "/usr/bin/../share/scan-view/ScanView.py", line 29, in <module>
import Reporter
ModuleNotFoundError: No module named 'Reporter'
```
Upstream context: https://reviews.llvm.org/D96367
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-09-22 0:06 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-16 10:18 [PR PATCH] clang: add missing file for scan-view Gottox
2021-09-16 14:11 ` q66
2021-09-17 6:03 ` [PR PATCH] [Updated] " Gottox
2021-09-17 6:04 ` Gottox
2021-09-17 10:12 ` q66
2021-09-18 7:59 ` Gottox
2021-09-18 8:39 ` [PR PATCH] [Updated] " Gottox
2021-09-18 8:39 ` Gottox
2021-09-18 14:46 ` q66
2021-09-19 16:01 ` Gottox
2021-09-21 10:26 ` q66
2021-09-22 0:06 ` [PR PATCH] [Closed]: " q66
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).