Page MenuHomeFreeBSD

Add all patches from base llvm/clang/lld/lldb 6.0 to devel/llvm60
ClosedPublic

Authored by dim on Oct 25 2018, 4:35 PM.

Details

Summary

This adds all the patches that were applied in the past to head, under
contrib/llvm. After these, there only minimal diffs left between the
port sources and the base sources.

Most of these remaining diffs are due to #ifdef shortcuts in the base
sources, because we don't compile certain features in. Other diffs are
because the port has applied a few changes that we don't have in base.

The list of PRs that were affected by the added patches is:

PR: 226658, 226872, 225128, 229050, 230604, 230444, 212343, 226388, 225471, 231355

I will also put this in the eventual commit message.

Test Plan

ideally this should be taken for an exp-run.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

dim created this revision.Oct 25 2018, 4:35 PM
dim added a comment.Oct 25 2018, 6:35 PM

Note: I plan to add each new patch that is merged into head also into this port, as long as head stays at llvm/clang 6.0.

I will submit a similar review for the devel/llvm70 port. Or maybe it's handy to do this in one review?

Probably easiest for me if you do a separate review.

brooks accepted this revision.Oct 26 2018, 5:55 PM

LGTM. It would be ideal to roll in the following patches I've had in my tree to avoid an extra revision bump (probably need to be hand applied due to copy/paste damage):

@@ -12,10 +12,7 @@
 MAINTAINER=    brooks@FreeBSD.org
 COMMENT=       LLVM and Clang
 
-LICENSE=       LLVM
-LICENSE_NAME=  LLVM Release License
-LICENSE_FILE=  ${WRKSRC}/LICENSE.TXT
-LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+.include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
 
 LLVM_RELEASE=  ${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=    ${LLVM_RELEASE:C/\.[0-9]$//}
@@ -228,6 +227,7 @@
 SHEBANG_FILES+=        tools/clang/tools/scan-view/bin/scan-view \
                tools/clang/tools/clang-format/git-clang-format \
                tools/clang/tools/clang-format/clang-format-diff.py
+USES+=         gnome
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
This revision is now accepted and ready to land.Oct 26 2018, 5:55 PM
dim added a comment.Oct 26 2018, 8:33 PM

LGTM. It would be ideal to roll in the following patches I've had in my tree to avoid an extra revision bump (probably need to be hand applied due to copy/paste damage):

...

+USES+= gnome

Huh, does it use gnome, really? Is that specifically for a clang-format or scan-view feature?

In D17702#378608, @dim wrote:

LGTM. It would be ideal to roll in the following patches I've had in my tree to avoid an extra revision bump (probably need to be hand applied due to copy/paste damage):

...

+USES+= gnome

Huh, does it use gnome, really? Is that specifically for a clang-format or scan-view feature?

Clang uses libxml2 which you get by adding USE_GNOME=libxml2 (set via CLANG_USE= GNOME=libxml2) this in turn requires USES=gnome. So no, it doesn't use gnome, but it uses the gnome infrastructure. IIRC libxml2 is optional, but it's not a big dependency so always adding it was easier than trying to force it to not be detected.

This revision was automatically updated to reflect the committed changes.