svn commit: r295337 - in projects/release-pkg: gnu/lib/libgcc lib/libc lib/libc++ lib/libcxxrt lib/libedit lib/libthr lib/msun lib/ncurses/ncurses libexec/rtld-elf release/packages
Glen Barber
gjb at FreeBSD.org
Fri Feb 5 21:01:11 UTC 2016
Author: gjb
Date: Fri Feb 5 21:01:08 2016
New Revision: 295337
URL: https://svnweb.freebsd.org/changeset/base/295337
Log:
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
Added:
projects/release-pkg/release/packages/clibs.ucl (contents, props changed)
Deleted:
projects/release-pkg/release/packages/libc.ucl
projects/release-pkg/release/packages/libedit.ucl
projects/release-pkg/release/packages/librtld_db.ucl
projects/release-pkg/release/packages/libthr.ucl
Modified:
projects/release-pkg/gnu/lib/libgcc/Makefile
projects/release-pkg/lib/libc++/Makefile
projects/release-pkg/lib/libc/Makefile
projects/release-pkg/lib/libcxxrt/Makefile
projects/release-pkg/lib/libedit/Makefile
projects/release-pkg/lib/libthr/Makefile
projects/release-pkg/lib/msun/Makefile
projects/release-pkg/lib/ncurses/ncurses/Makefile
projects/release-pkg/libexec/rtld-elf/Makefile
projects/release-pkg/release/packages/runtime.ucl
Modified: projects/release-pkg/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/release-pkg/gnu/lib/libgcc/Makefile Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/gnu/lib/libgcc/Makefile Fri Feb 5 21:01:08 2016 (r295337)
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= clibs
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
COMPILERRTDIR= ${.CURDIR}/../../../contrib/compiler-rt
Modified: projects/release-pkg/lib/libc++/Makefile
==============================================================================
--- projects/release-pkg/lib/libc++/Makefile Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/lib/libc++/Makefile Fri Feb 5 21:01:08 2016 (r295337)
@@ -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
Modified: projects/release-pkg/lib/libc/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/Makefile Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/lib/libc/Makefile Fri Feb 5 21:01:08 2016 (r295337)
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
# $FreeBSD$
-PACKAGE= lib${LIB}
+PACKAGE= clibs
SHLIBDIR?= /lib
.include <src.opts.mk>
Modified: projects/release-pkg/lib/libcxxrt/Makefile
==============================================================================
--- projects/release-pkg/lib/libcxxrt/Makefile Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/lib/libcxxrt/Makefile Fri Feb 5 21:01:08 2016 (r295337)
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
+PACKAGE= clibs
SRCDIR= ${.CURDIR}/../../contrib/libcxxrt
SHLIB_MAJOR= 1
Modified: projects/release-pkg/lib/libedit/Makefile
==============================================================================
--- projects/release-pkg/lib/libedit/Makefile Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/lib/libedit/Makefile Fri Feb 5 21:01:08 2016 (r295337)
@@ -2,7 +2,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-PACKAGE=lib${LIB}
+PACKAGE=clibs
LIB= edit
SHLIB_MAJOR= 7
SHLIBDIR?= /lib
Modified: projects/release-pkg/lib/libthr/Makefile
==============================================================================
--- projects/release-pkg/lib/libthr/Makefile Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/lib/libthr/Makefile Fri Feb 5 21:01:08 2016 (r295337)
@@ -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>
Modified: projects/release-pkg/lib/msun/Makefile
==============================================================================
--- projects/release-pkg/lib/msun/Makefile Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/lib/msun/Makefile Fri Feb 5 21:01:08 2016 (r295337)
@@ -12,7 +12,7 @@
#
#
-PACKAGE=lib${LIB}
+PACKAGE= clibs
.if ${MACHINE_CPUARCH} == "i386"
ARCH_SUBDIR= i387
.else
Modified: projects/release-pkg/lib/ncurses/ncurses/Makefile
==============================================================================
--- projects/release-pkg/lib/ncurses/ncurses/Makefile Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/lib/ncurses/ncurses/Makefile Fri Feb 5 21:01:08 2016 (r295337)
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= clibs
SHLIBDIR?= /lib
.if !defined(ENABLE_WIDEC)
Modified: projects/release-pkg/libexec/rtld-elf/Makefile
==============================================================================
--- projects/release-pkg/libexec/rtld-elf/Makefile Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/libexec/rtld-elf/Makefile Fri Feb 5 21:01:08 2016 (r295337)
@@ -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
Added: projects/release-pkg/release/packages/clibs.ucl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/release/packages/clibs.ucl Fri Feb 5 21:01:08 2016 (r295337)
@@ -0,0 +1,17 @@
+#
+# $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 = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
Modified: projects/release-pkg/release/packages/runtime.ucl
==============================================================================
--- projects/release-pkg/release/packages/runtime.ucl Fri Feb 5 20:57:21 2016 (r295336)
+++ projects/release-pkg/release/packages/runtime.ucl Fri Feb 5 21:01:08 2016 (r295337)
@@ -22,8 +22,7 @@ scripts: {
EOD
}
deps: {
- # For sh(1).
- "FreeBSD-libedit": {
+ "FreeBSD-clibs": {
origin: "base"
version: "%VERSION%"
}
More information about the svn-src-projects
mailing list