Split pkgs required by xbps-base-chroot, as it was made in Fedora.
- Added an additional shell func to add full (build/run), build or run time dependencies to packages. An optional third parameter can be used to specify other version than the one set in the depends file. - Use a "depends" file in package directory to specify minimum required ABI/API version for a package, so that there's no need to set the version all the time in pkgs. - Updated bash to 4.0. --HG-- extra : convert_revision : 1aa0ce32d4bdc2cd371eac19ae7bcff2c986b6b3
This commit is contained in:
@@ -1,25 +0,0 @@
|
||||
# Template file for 'glibc-base'.
|
||||
#
|
||||
short_desc="${short_desc} (base files)"
|
||||
long_desc="${long_desc}
|
||||
|
||||
This package contains the ${sourcepkg} base programs and libraries."
|
||||
|
||||
conf_files="/etc/localtime /etc/ld.so.cache /etc/ld.so.conf /etc/rpc
|
||||
/etc/nsswitch.conf"
|
||||
|
||||
. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
|
||||
|
||||
do_install()
|
||||
{
|
||||
local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
|
||||
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
|
||||
|
||||
mkdir -p ${destdir}/usr/lib
|
||||
mv ${origdir}/etc ${destdir}
|
||||
mv ${origdir}/sbin ${destdir}
|
||||
mv ${origdir}/usr/bin ${destdir}/usr
|
||||
mv ${origdir}/usr/sbin ${destdir}/usr
|
||||
mv ${origdir}/usr/lib/getconf ${destdir}/usr/lib
|
||||
mv ${origdir}/usr/lib/pt_chown ${destdir}/usr/lib
|
||||
}
|
||||
2
templates/glibc/depends
Normal file
2
templates/glibc/depends
Normal file
@@ -0,0 +1,2 @@
|
||||
abi_depends=2.8
|
||||
api_depends=${abi_depends}
|
||||
@@ -1,11 +1,11 @@
|
||||
# Template file for 'glibc-dev'.
|
||||
# Template file for 'glibc-devel'.
|
||||
#
|
||||
short_desc="${short_desc} (development files)"
|
||||
long_desc="${long_desc}
|
||||
|
||||
This package contains files for development, headers, static libs, etc."
|
||||
This package contains files for development: headers, static libs, etc."
|
||||
|
||||
. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
|
||||
Add_dependency run glibc
|
||||
|
||||
do_install()
|
||||
{
|
||||
@@ -15,4 +15,6 @@ do_install()
|
||||
mkdir -p ${destdir}/usr/lib
|
||||
mv ${origdir}/usr/include ${destdir}/usr
|
||||
mv ${origdir}/usr/lib/*.a ${destdir}/usr/lib
|
||||
mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib
|
||||
mv ${origdir}/usr/lib/*crt1.o ${destdir}/usr/lib
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
run_depends="${run_depends} glibc-libs-2.8"
|
||||
@@ -1,19 +0,0 @@
|
||||
# Template file for 'glibc-libs'.
|
||||
#
|
||||
short_desc="${short_desc} (libraries)"
|
||||
long_desc="${long_desc}
|
||||
|
||||
This package contains only the ${sourcepkg} shared libraries."
|
||||
run_depends="xbps-base-dirs-1.0"
|
||||
|
||||
do_install()
|
||||
{
|
||||
local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
|
||||
local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
|
||||
|
||||
mkdir -p ${destdir}/lib
|
||||
mkdir -p ${destdir}/usr/lib
|
||||
mv ${origdir}/lib/*.*o* ${destdir}/lib
|
||||
mv ${origdir}/usr/lib/*.*o* ${destdir}/usr/lib
|
||||
mv ${origdir}/usr/lib/gconv ${destdir}/usr/lib
|
||||
}
|
||||
@@ -1,10 +1,9 @@
|
||||
# Template file for 'glibc-locale'.
|
||||
# Template file for 'glibc-locales'.
|
||||
#
|
||||
short_desc="${short_desc} (locales)"
|
||||
long_desc="${long_desc}
|
||||
|
||||
This package contains the ${sourcepkg} locale files, for non US users."
|
||||
run_depends=
|
||||
noarch=yes
|
||||
|
||||
do_install()
|
||||
@@ -23,8 +23,12 @@ long_desc="
|
||||
languages use the C library to access the underlying operating system."
|
||||
|
||||
base_chroot=yes
|
||||
build_depends="gcc-4.3.2 gawk-3.1.6"
|
||||
subpackages="base dev libs locale"
|
||||
subpackages="devel locales"
|
||||
|
||||
Add_dependency build gcc
|
||||
Add_dependency build gawk
|
||||
Add_dependency run gcc-libgcc
|
||||
Add_dependency run glibc-locales
|
||||
|
||||
pre_configure()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user