Magellan Linux

Diff of /smage/branches/alx-0_6_0/core/glibc/glibc-2.13.0-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1736 by niro, Mon Apr 11 08:00:08 2011 UTC revision 1737 by niro, Mon Apr 11 14:13:59 2011 UTC
# Line 480  src_install_glibc-dev() Line 480  src_install_glibc-dev()
480   # nscd configuration file   # nscd configuration file
481   minstalletc nscd.conf || die   minstalletc nscd.conf || die
482    
483     # busybox compat
484     local args
485     if [[ $(readlink /bin/cp) = */busybox ]]
486     then
487     args="-f"
488     else
489     args="--remove-destination"
490     fi
491   # we use Berlin as default   # we use Berlin as default
492   cp --remove-destination ${BINDIR}/usr/share/zoneinfo/Europe/Berlin ${BINDIR}/etc/localtime || die   cp ${args} ${BINDIR}/usr/share/zoneinfo/Europe/Berlin ${BINDIR}/etc/localtime || die
493    
494   [ -f ${BINDIR}/etc/ld.so.conf ] && { rm -f ${BINDIR}/etc/ld.so.conf || die; }   [ -f ${BINDIR}/etc/ld.so.conf ] && { rm -f ${BINDIR}/etc/ld.so.conf || die; }
495   [ -e ${BINDIR}/etc/ld.so.cache ] && { rm -rf ${BINDIR}/etc/ld.so.cache || die; }   [ -e ${BINDIR}/etc/ld.so.cache ] && { rm -rf ${BINDIR}/etc/ld.so.cache || die; }
496    

Legend:
Removed from v.1736  
changed lines
  Added in v.1737