tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

glibc: relax dep versions; move nsswitch.conf to base-files.

Browse Source
This commit is contained in:
Juan RP 2012-10-24 07:20:40 +02:00
parent 9b804c0f8d
commit 09b286be63
3 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
srcpkgs/glibc/files/nsswitch.conf
View File

@ -1,15 +0,0 @@
# /etc/nsswitch.conf
#
# See nsswitch.conf(5) for information.
#
passwd: files
group: files
shadow: files
hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4
networks: files
protocols: files
services: files
ethers: files
rpc: files

2
srcpkgs/glibc/glibc-devel.template
View File

@ -1,6 +1,6 @@
# Template file for 'glibc-devel'. # Template file for 'glibc-devel'.
# #
depends="kernel-libc-headers>=3.4<3.5 glibc>=$version" depends="kernel-libc-headers glibc>=${version}"
short_desc="${short_desc} (development files)" short_desc="${short_desc} (development files)"
long_desc="${long_desc} long_desc="${long_desc}

22
srcpkgs/glibc/template
View File

@ -2,22 +2,15 @@
pkgname=glibc pkgname=glibc
_majorver=2.16 _majorver=2.16
version=${_majorver}.0 version=${_majorver}.0
revision=9 revision=10
short_desc="The GNU C library" short_desc="The GNU C library"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/libc" homepage="http://www.gnu.org/software/libc"
license="GPL-2, LGPL-2.1, BSD" license="GPL-2, LGPL-2.1, BSD"
nostrip_files=" conf_files="/etc/rpc /etc/ld.so.conf"
ld-${_majorver}.so
libc-${_majorver}.so
libpthread-${_majorver}.so
libthread_db-1.0.so"
conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf"
subpackages="glibc-devel glibc-locales nscd" subpackages="glibc-devel glibc-locales nscd"
depends="base-files glibc-locales" depends="base-files glibc-locales"
makedepends="bison perl kernel-libc-headers>=3.4<3.5" makedepends="bison perl kernel-libc-headers>=3.6<3.7"
replaces="glibc>=0"
softreplace=yes
distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz" distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz"
checksum=1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 checksum=1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924
long_desc=" long_desc="
@ -27,6 +20,14 @@ long_desc="
as C++ and Objective C; the runtime facilities of other programming as C++ and Objective C; the runtime facilities of other programming
languages use the C library to access the underlying operating system." languages use the C library to access the underlying operating system."
nostrip_files="
ld-${_majorver}.so
libc-${_majorver}.so
libpthread-${_majorver}.so
libthread_db-1.0.so"
softreplace=yes
do_configure() { do_configure() {
mkdir build && cd build mkdir build && cd build
@ -81,7 +82,6 @@ do_install() {
sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \ sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \
${DESTDIR}/usr/bin/ldd ${DESTDIR}/usr/bin/ldd
fi fi
install -m644 ${FILESDIR}/nsswitch.conf ${DESTDIR}/etc
install -d ${DESTDIR}/etc/ld.so.conf.d install -d ${DESTDIR}/etc/ld.so.conf.d
echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
chmod 644 ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf chmod 644 ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf