Fix packaging for clang, lldb and lld 3.9.0

During the upgrade of clang/llvm etc to 3.9.0 in r309124, the PACKAGE
directive in the usr.bin/clang/*.mk files got dropped accidentally.

Restore it, with a few minor changes and additions:
* Correct license in clang.ucl to NCSA
* Add PACKAGE=clang for clang and most of the "ll" tools
* Put lldb in its own package
* Put lld in its own package

Reviewed by:	gjb, jmallett
X-MFC-With:	309124
Differential Revision: https://reviews.freebsd.org/D8666
This commit is contained in:
Dimitry Andric 2016-11-28 20:13:56 +00:00
parent dc9d21f8b0
commit 8930262bce
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=309262
7 changed files with 55 additions and 1 deletions

View File

@ -11,7 +11,7 @@ maintainer = "re@FreeBSD.org"
www = "https://www.FreeBSD.org"
prefix = "/"
licenselogic = "single"
licenses = [ BSD2CLAUSE ]
licenses = [ NCSA ]
desc = <<EOD
%DESC%
EOD

24
release/packages/lld.ucl Normal file
View File

@ -0,0 +1,24 @@
#
# $FreeBSD$
#
name = "FreeBSD-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
maintainer = "re@FreeBSD.org"
www = "https://www.FreeBSD.org"
prefix = "/"
licenselogic = "single"
licenses = [ NCSA ]
desc = <<EOD
%DESC%
EOD
deps: {
FreeBSD-%PKGDEPS%: {
origin: "base",
version: "%VERSION%"
}
}

24
release/packages/lldb.ucl Normal file
View File

@ -0,0 +1,24 @@
#
# $FreeBSD$
#
name = "FreeBSD-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
maintainer = "re@FreeBSD.org"
www = "https://www.FreeBSD.org"
prefix = "/"
licenselogic = "single"
licenses = [ NCSA ]
desc = <<EOD
%DESC%
EOD
deps: {
FreeBSD-%PKGDEPS%: {
origin: "base",
version: "%VERSION%"
}
}

View File

@ -15,6 +15,8 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
.endfor
PACKAGE= clang
LIBADD+= ncursesw
LIBADD+= pthread

View File

@ -5,6 +5,7 @@
LLVM_SRCS= ${SRCTOP}/contrib/llvm
LLD_SRCS= ${LLVM_SRCS}/tools/lld
PACKAGE= lld
PROG_CXX= ld.lld
MAN=
.if ${MK_LLD_AS_LD} != "no"

View File

@ -2,6 +2,7 @@
.include "${SRCTOP}/lib/clang/lldb.pre.mk"
PACKAGE= lldb
PROG_CXX= lldb
# Man page directory
.PATH: ${LLDB_SRCS}/docs

View File

@ -19,6 +19,8 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
.endfor
PACKAGE= clang
LIBADD+= ncursesw
LIBADD+= pthread