jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

glibc: move to usr/bin.

Browse source
This commit is contained in:
Juan RP 2015-06-02 10:03:09 +02:00
parent efbb04a370
commit c948a0f72b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
srcpkgs/glibc/template
View file

@ -1,7 +1,7 @@
# Template file for 'glibc' # Template file for 'glibc'
pkgname=glibc pkgname=glibc
version=2.21 version=2.21
revision=6 revision=7
bootstrap=yes bootstrap=yes
short_desc="The GNU C library" short_desc="The GNU C library"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
@ -70,7 +70,7 @@ do_configure() {
echo "slibdir=${_libdir}" > configparms echo "slibdir=${_libdir}" > configparms
echo "bindir=/usr/bin" >> configparms echo "bindir=/usr/bin" >> configparms
echo "sbindir=/usr/sbin" >> configparms echo "sbindir=/usr/bin" >> configparms
echo "rootsbindir=/usr/sbin" >> configparms echo "rootsbindir=/usr/sbin" >> configparms
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
@ -99,7 +99,7 @@ do_configure() {
export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=?/}" export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=?/}"
SHELL=/bin/bash ../configure ${configure_args} \ SHELL=/bin/bash ../configure ${configure_args} \
--bindir=/usr/bin --sbindir=/usr/sbin \ --bindir=/usr/bin --sbindir=/usr/bin \
--libdir=${_libdir} --libexecdir=${_libdir} \ --libdir=${_libdir} --libexecdir=${_libdir} \
--enable-add-ons=libidn --enable-obsolete-rpc \ --enable-add-ons=libidn --enable-obsolete-rpc \
--enable-multi-arch --enable-bind-now \ --enable-multi-arch --enable-bind-now \
@ -107,7 +107,7 @@ do_configure() {
--enable-stack-guard-randomization \ --enable-stack-guard-randomization \
--without-selinux --without-cvs --without-gd \ --without-selinux --without-cvs --without-gd \
--disable-lock-elision \ --disable-lock-elision \
libc_cv_rootsbindir=/usr/sbin \ libc_cv_rootsbindir=/usr/bin \
libc_cv_rtlddir=${_libdir} libc_cv_slibdir=${_libdir} libc_cv_rtlddir=${_libdir} libc_cv_slibdir=${_libdir}
} }
@ -155,7 +155,7 @@ do_install() {
rm -rf ${DESTDIR}/var/db rm -rf ${DESTDIR}/var/db
# Remove tzselect and z{dump,ic}, provided by tzutils. # Remove tzselect and z{dump,ic}, provided by tzutils.
rm -f ${DESTDIR}/usr/bin/tzselect rm -f ${DESTDIR}/usr/bin/tzselect
rm -f ${DESTDIR}/usr/sbin/z{dump,ic} rm -f ${DESTDIR}/usr/bin/z{dump,ic}
} }
glibc-devel_package() { glibc-devel_package() {
@ -184,7 +184,7 @@ nscd_package() {
conf_files="/etc/nscd.conf" conf_files="/etc/nscd.conf"
short_desc+=" - Name Service Cache Daemon" short_desc+=" - Name Service Cache Daemon"
pkg_install() { pkg_install() {
vmove usr/sbin/nscd vmove usr/bin/nscd
if [ "$build_option_systemd" ]; then if [ "$build_option_systemd" ]; then
vinstall ${wrksrc}/nscd/nscd.service 644 usr/lib/systemd/system vinstall ${wrksrc}/nscd/nscd.service 644 usr/lib/systemd/system
vinstall ${wrksrc}/nscd/nscd.tmpfiles 644 usr/lib/tmpfiles.d nscd.conf vinstall ${wrksrc}/nscd/nscd.tmpfiles 644 usr/lib/tmpfiles.d nscd.conf