svn commit: r309262 - in head: release/packages usr.bin/clang usr.bin/clang/lld usr.bin/clang/lldb

[Dimitry Andric]

Author: dim
Date: Mon Nov 28 20:13:56 2016
New Revision: 309262
URL: https://svnweb.freebsd.org/changeset/base/309262

Log:
  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

Added:
  head/release/packages/lld.ucl   (contents, props changed)
  head/release/packages/lldb.ucl   (contents, props changed)
Modified:
  head/release/packages/clang.ucl
  head/usr.bin/clang/clang.prog.mk
  head/usr.bin/clang/lld/Makefile
  head/usr.bin/clang/lldb/Makefile
  head/usr.bin/clang/llvm.prog.mk

Modified: head/release/packages/clang.ucl
==============================================================================
--- head/release/packages/clang.ucl	Mon Nov 28 20:11:13 2016	(r309261)
+++ head/release/packages/clang.ucl	Mon Nov 28 20:13:56 2016	(r309262)
@@ -11,7 +11,7 @@ maintainer = "re at FreeBSD.org"
 www = "https://www.FreeBSD.org"
 prefix = "/"
 licenselogic = "single"
-licenses = [ BSD2CLAUSE ]
+licenses = [ NCSA ]
 desc = <<EOD
 %DESC%
 EOD

Added: head/release/packages/lld.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/release/packages/lld.ucl	Mon Nov 28 20:13:56 2016	(r309262)
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re at FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ NCSA ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Added: head/release/packages/lldb.ucl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/release/packages/lldb.ucl	Mon Nov 28 20:13:56 2016	(r309262)
@@ -0,0 +1,24 @@
+#
+# $FreeBSD$
+#
+
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re at FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ NCSA ]
+desc = <<EOD
+%DESC%
+EOD
+deps: {
+    FreeBSD-%PKGDEPS%: {
+        origin: "base",
+        version: "%VERSION%"
+    }
+}
+

Modified: head/usr.bin/clang/clang.prog.mk
==============================================================================
--- head/usr.bin/clang/clang.prog.mk	Mon Nov 28 20:11:13 2016	(r309261)
+++ head/usr.bin/clang/clang.prog.mk	Mon Nov 28 20:13:56 2016	(r309262)
@@ -15,6 +15,8 @@ DPADD+=		${OBJTOP}/lib/clang/lib${lib}/l
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
+PACKAGE=	clang
+
 LIBADD+=	ncursesw
 LIBADD+=	pthread
 

Modified: head/usr.bin/clang/lld/Makefile
==============================================================================
--- head/usr.bin/clang/lld/Makefile	Mon Nov 28 20:11:13 2016	(r309261)
+++ head/usr.bin/clang/lld/Makefile	Mon Nov 28 20:13:56 2016	(r309262)
@@ -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"

Modified: head/usr.bin/clang/lldb/Makefile
==============================================================================
--- head/usr.bin/clang/lldb/Makefile	Mon Nov 28 20:11:13 2016	(r309261)
+++ head/usr.bin/clang/lldb/Makefile	Mon Nov 28 20:13:56 2016	(r309262)
@@ -2,6 +2,7 @@
 
 .include "${SRCTOP}/lib/clang/lldb.pre.mk"
 
+PACKAGE=	lldb
 PROG_CXX=	lldb
 # Man page directory
 .PATH:		${LLDB_SRCS}/docs

Modified: head/usr.bin/clang/llvm.prog.mk
==============================================================================
--- head/usr.bin/clang/llvm.prog.mk	Mon Nov 28 20:11:13 2016	(r309261)
+++ head/usr.bin/clang/llvm.prog.mk	Mon Nov 28 20:13:56 2016	(r309262)
@@ -19,6 +19,8 @@ DPADD+=		${OBJTOP}/lib/clang/lib${lib}/l
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
+PACKAGE=	clang
+
 LIBADD+=	ncursesw
 LIBADD+=	pthread