aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-02-05 21:01:08 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-02-05 21:01:08 +0000
commitc389411c8aa86e3ffa6e7b24ecef1d8c94549bb8 (patch)
treed202f169da241769452be64ff9d6811a356945a0
parent41a737904fb2cd0700caa74060aaf8eac9421d22 (diff)
downloadsrc-c389411c8aa86e3ffa6e7b24ecef1d8c94549bb8.tar.gz
src-c389411c8aa86e3ffa6e7b24ecef1d8c94549bb8.zip
Remove libc, librtld_db, libthr packages, and further increase
the constraints on what needs to be installed in a specific to maintain consistency during upgrades. Create a new clibs package containing libraries that are needed as a bare minimum for consistency. With much help and input from: kib Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-pkg/; revision=295337
-rw-r--r--gnu/lib/libgcc/Makefile1
-rw-r--r--lib/libc++/Makefile2
-rw-r--r--lib/libc/Makefile2
-rw-r--r--lib/libcxxrt/Makefile2
-rw-r--r--lib/libedit/Makefile2
-rw-r--r--lib/libthr/Makefile2
-rw-r--r--lib/msun/Makefile2
-rw-r--r--lib/ncurses/ncurses/Makefile1
-rw-r--r--libexec/rtld-elf/Makefile5
-rw-r--r--release/packages/clibs.ucl (renamed from release/packages/librtld_db.ucl)5
-rw-r--r--release/packages/libc.ucl27
-rw-r--r--release/packages/libedit.ucl27
-rw-r--r--release/packages/libthr.ucl27
-rw-r--r--release/packages/runtime.ucl3
14 files changed, 13 insertions, 95 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 05f796197eb7..c1b1e363399a 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= clibs
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
COMPILERRTDIR= ${.CURDIR}/../../../contrib/compiler-rt
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 33b1e44ff328..7794928bc328 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-PACKAGE= lib${LIB}
+PACKAGE= clibs
_LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt
HDRDIR= ${.CURDIR}/../../contrib/libc++/include
SRCDIR= ${.CURDIR}/../../contrib/libc++/src
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index b07dfeeca200..17b9720f3605 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
# $FreeBSD$
-PACKAGE= lib${LIB}
+PACKAGE= clibs
SHLIBDIR?= /lib
.include <src.opts.mk>
diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile
index 50305aa9b686..8f3d9c54c3b7 100644
--- a/lib/libcxxrt/Makefile
+++ b/lib/libcxxrt/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
+PACKAGE= clibs
SRCDIR= ${.CURDIR}/../../contrib/libcxxrt
SHLIB_MAJOR= 1
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index f2f313d29fd0..14c9cbbcc175 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -2,7 +2,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-PACKAGE=lib${LIB}
+PACKAGE=clibs
LIB= edit
SHLIB_MAJOR= 7
SHLIBDIR?= /lib
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 0fac742b98b4..7a080e0f2580 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -8,7 +8,7 @@
# (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the
# system call stubs.
-PACKAGE=lib${LIB}
+PACKAGE= clibs
SHLIBDIR?= /lib
.include <src.opts.mk>
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index cebfbd7ba556..820855c86a75 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -12,7 +12,7 @@
#
#
-PACKAGE=lib${LIB}
+PACKAGE= clibs
.if ${MACHINE_CPUARCH} == "i386"
ARCH_SUBDIR= i387
.else
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 94fb03a9b278..cf9053ca94c8 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= clibs
SHLIBDIR?= /lib
.if !defined(ENABLE_WIDEC)
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 66ff5e91739b..e2ebcce5f857 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -5,10 +5,13 @@
# make DEBUG_FLAGS=-g DEBUG=-DDEBUG MK_TESTS=no all
.include <src.opts.mk>
-PACKAGE= librtld_db
+PACKAGE= clibs
MK_SSP= no
PROG?= ld-elf.so.1
+.if (${PROG:M*ld-elf32*} != "")
+TAGS+= lib32
+.endif
SRCS= rtld_start.S \
reloc.c rtld.c rtld_lock.c rtld_printf.c map_object.c \
malloc.c xmalloc.c debug.c libmap.c
diff --git a/release/packages/librtld_db.ucl b/release/packages/clibs.ucl
index 7b59dc22d1ff..38844f0f0898 100644
--- a/release/packages/librtld_db.ucl
+++ b/release/packages/clibs.ucl
@@ -15,8 +15,3 @@ licenses = [ BSD2CLAUSE ]
desc = <<EOD
%DESC%
EOD
-# XXX: Temporary.
-shlibs_provided: [
- "librtld_db.so.2"
-]
-
diff --git a/release/packages/libc.ucl b/release/packages/libc.ucl
deleted file mode 100644
index e7a76b855b33..000000000000
--- a/release/packages/libc.ucl
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# $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 = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-# XXX: Temporary.
-shlibs_required: [
- "librtld_db.so.2"
-]
-deps: {
- "FreeBSD-librtld_db": {
- origin: "base"
- version: "%VERSION%"
- }
-}
diff --git a/release/packages/libedit.ucl b/release/packages/libedit.ucl
deleted file mode 100644
index db46616e4a49..000000000000
--- a/release/packages/libedit.ucl
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# $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 = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-# XXX: Temporary.
-shlibs_required: [
- "libthr.so.3"
-]
-deps: {
- "FreeBSD-libthr": {
- origin: "base"
- version: "%VERSION%"
- }
-}
diff --git a/release/packages/libthr.ucl b/release/packages/libthr.ucl
deleted file mode 100644
index 7716a9df6231..000000000000
--- a/release/packages/libthr.ucl
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# $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 = [ BSD2CLAUSE ]
-desc = <<EOD
-%DESC%
-EOD
-# XXX: Temporary.
-shlibs_required: [
- "libc.so.7"
-]
-deps: {
- "FreeBSD-libc": {
- origin: "base"
- version: "%VERSION%"
- }
-}
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index c9908551a1bf..be45369f1450 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -22,8 +22,7 @@ scripts: {
EOD
}
deps: {
- # For sh(1).
- "FreeBSD-libedit": {
+ "FreeBSD-clibs": {
origin: "base"
version: "%VERSION%"
}