Page MenuHomeFreeBSD

D41815.diff
No OneTemporary

D41815.diff

diff --git a/include/Makefile b/include/Makefile
--- a/include/Makefile
+++ b/include/Makefile
@@ -4,7 +4,7 @@
.include <src.opts.mk>
-PACKAGE=runtime
+PACKAGE=clibs
CLEANFILES= osreldate.h version
SUBDIR= arpa protocols rpcsvc rpc xlocale
.if ${MACHINE_CPUARCH} == "amd64"
diff --git a/include/Makefile.inc b/include/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/include/Makefile.inc
@@ -0,0 +1,2 @@
+# Make sure all our subdirectory headers end up in clibs-dev
+PACKAGE=clibs
diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc
--- a/lib/clang/Makefile.inc
+++ b/lib/clang/Makefile.inc
@@ -1,6 +1,7 @@
.include <bsd.compiler.mk>
+PACKAGE= clang
MK_PIE:= no # Explicit libXXX.a references
.if ${COMPILER_TYPE} == "clang"
diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
--- a/lib/csu/Makefile.inc
+++ b/lib/csu/Makefile.inc
@@ -1,3 +1,4 @@
+PACKAGE= clibs-dev
NO_WMISSING_VARIABLE_DECLARATIONS=
# Can't instrument these files since that breaks non-sanitized programs.
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -1,6 +1,7 @@
.include <bsd.compiler.mk>
+PACKAGE= clang
CRTSRC= ${SRCTOP}/contrib/llvm-project/compiler-rt
.include "compiler-rt-vars.mk"
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -44,6 +44,9 @@
certctl)
pkgdeps="caroot openssl"
;;
+ clang)
+ pkgdeps="lld clang-dev libcompiler_rt-dev"
+ ;;
# -dev packages that have no corresponding non-dev package
# as a dependency.

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 28, 2:15 AM (10 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16238303
Default Alt Text
D41815.diff (1 KB)

Event Timeline