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:
parent
dc9d21f8b0
commit
8930262bce
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=309262
@ -11,7 +11,7 @@ maintainer = "re@FreeBSD.org"
|
|||||||
www = "https://www.FreeBSD.org"
|
www = "https://www.FreeBSD.org"
|
||||||
prefix = "/"
|
prefix = "/"
|
||||||
licenselogic = "single"
|
licenselogic = "single"
|
||||||
licenses = [ BSD2CLAUSE ]
|
licenses = [ NCSA ]
|
||||||
desc = <<EOD
|
desc = <<EOD
|
||||||
%DESC%
|
%DESC%
|
||||||
EOD
|
EOD
|
||||||
|
24
release/packages/lld.ucl
Normal file
24
release/packages/lld.ucl
Normal 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
24
release/packages/lldb.ucl
Normal 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%"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -15,6 +15,8 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
|
|||||||
LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
|
LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
PACKAGE= clang
|
||||||
|
|
||||||
LIBADD+= ncursesw
|
LIBADD+= ncursesw
|
||||||
LIBADD+= pthread
|
LIBADD+= pthread
|
||||||
|
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
LLVM_SRCS= ${SRCTOP}/contrib/llvm
|
LLVM_SRCS= ${SRCTOP}/contrib/llvm
|
||||||
LLD_SRCS= ${LLVM_SRCS}/tools/lld
|
LLD_SRCS= ${LLVM_SRCS}/tools/lld
|
||||||
|
|
||||||
|
PACKAGE= lld
|
||||||
PROG_CXX= ld.lld
|
PROG_CXX= ld.lld
|
||||||
MAN=
|
MAN=
|
||||||
.if ${MK_LLD_AS_LD} != "no"
|
.if ${MK_LLD_AS_LD} != "no"
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
.include "${SRCTOP}/lib/clang/lldb.pre.mk"
|
.include "${SRCTOP}/lib/clang/lldb.pre.mk"
|
||||||
|
|
||||||
|
PACKAGE= lldb
|
||||||
PROG_CXX= lldb
|
PROG_CXX= lldb
|
||||||
# Man page directory
|
# Man page directory
|
||||||
.PATH: ${LLDB_SRCS}/docs
|
.PATH: ${LLDB_SRCS}/docs
|
||||||
|
@ -19,6 +19,8 @@ DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
|
|||||||
LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
|
LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
PACKAGE= clang
|
||||||
|
|
||||||
LIBADD+= ncursesw
|
LIBADD+= ncursesw
|
||||||
LIBADD+= pthread
|
LIBADD+= pthread
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user