d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove libc, librtld_db, libthr packages, and further increase

Browse Source 
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
This commit is contained in:
Glen Barber 2016-02-05 21:01:08 +00:00
parent 41a737904f
commit c389411c8a
14 changed files with 13 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/lib/libgcc/Makefile
View File

@ -1,5 +1,6 @@
# $FreeBSD$
PACKAGE= clibs
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
COMPILERRTDIR= ${.CURDIR}/../../../contrib/compiler-rt

2
lib/libc++/Makefile
View File

@ -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

2
lib/libc/Makefile
View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
# $FreeBSD$
PACKAGE= lib${LIB}
PACKAGE= clibs
SHLIBDIR?= /lib
.include <src.opts.mk>

2
lib/libcxxrt/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
PACKAGE=lib${LIB}
PACKAGE= clibs
SRCDIR= ${.CURDIR}/../../contrib/libcxxrt
SHLIB_MAJOR= 1

2
lib/libedit/Makefile
View File

@ -2,7 +2,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
PACKAGE=lib${LIB}
PACKAGE=clibs
LIB= edit
SHLIB_MAJOR= 7
SHLIBDIR?= /lib

2
lib/libthr/Makefile
View File

@ -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>

2
lib/msun/Makefile
View File

@ -12,7 +12,7 @@
#
#
PACKAGE=lib${LIB}
PACKAGE= clibs
.if ${MACHINE_CPUARCH} == "i386"
ARCH_SUBDIR= i387
.else

1
lib/ncurses/ncurses/Makefile
View File

@ -1,5 +1,6 @@
# $FreeBSD$
PACKAGE= clibs
SHLIBDIR?= /lib
.if !defined(ENABLE_WIDEC)

5
libexec/rtld-elf/Makefile
View File

@ -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

5
release/packages/librtld_db.ucl → release/packages/clibs.ucl
View File

@ -15,8 +15,3 @@ licenses = [ BSD2CLAUSE ]
desc = <<EOD
%DESC%
EOD
# XXX: Temporary.
shlibs_provided: [
"librtld_db.so.2"
]

27
release/packages/libc.ucl
View File

@ -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%"
}
}

27
release/packages/libedit.ucl
View File

@ -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%"
}
}

27
release/packages/libthr.ucl
View File

@ -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%"
}
}

3
release/packages/runtime.ucl
View File

@ -22,8 +22,7 @@ scripts: {
EOD
}
deps: {
# For sh(1).
"FreeBSD-libedit": {
"FreeBSD-clibs": {
origin: "base"
version: "%VERSION%"
}