Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/glibc/glibc-2.16.0-r1.smage2

    Diff of /smage/trunk/core/glibc/glibc-2.16.0-r1.smage2

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

    revision 3622 by niro, Wed Jul 11 12:50:01 2012 UTC revision 3623 by niro, Thu Jul 12 08:19:05 2012 UTC
    # Line 106  src_prepare() Line 106  src_prepare()
    106   # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch   # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch
    107   mpatch ${PNAME}-${PVER}-revert-c5a0802a.patch || die   mpatch ${PNAME}-${PVER}-revert-c5a0802a.patch || die
    108    
    109     # scripts/test-installation.pl sometime fails
    110     #
    111     #  CC="gcc" /usr/bin/perl scripts/test-installation.pl
    112     #  /usr/src/glibc-2.16.0.bld/
    113     #  Unmatched ( in regex; marked by <-- HERE in m/$( <-- HERE if $(abi-32-ld-soname),$(abi-32-ld-soname),ld/ at scripts/test-installation.pl line 172, <LDD>
    114     #  line 1
    115     sed -i 's:CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)::' Makefile || die
    116    
    117   # binutils patch needs reconf   # binutils patch needs reconf
    118   autoconf --force || die  # autoconf --force || die
    119    
    120   # fix permissions on some of the scripts   # fix permissions on some of the scripts
    121   chmod u+x ${SRCDIR}/scripts/*.sh || die   chmod u+x ${SRCDIR}/scripts/*.sh || die
    # Line 308  src_install_glibc-dev() Line 316  src_install_glibc-dev()
    316   # gai configuration file   # gai configuration file
    317   minstalletc ${SRCDIR}/posix/gai.conf || die   minstalletc ${SRCDIR}/posix/gai.conf || die
    318    
      # busybox compat  
      local args  
      if [[ $(readlink /bin/cp) = */busybox ]]  
      then  
      args="-f"  
      else  
      args="--remove-destination"  
      fi  
       
    319   # now in tzdata   # now in tzdata
    320   # we use Berlin as default   # we use Berlin as default
    321     # busybox compat
    322     #local args
    323     #if [[ $(readlink /bin/cp) = */busybox ]]
    324     #then
    325     # args="-f"
    326     #else
    327     # args="--remove-destination"
    328     #fi
    329   #cp ${args} ${BINDIR}/usr/share/zoneinfo/Europe/Berlin ${BINDIR}/etc/localtime || die   #cp ${args} ${BINDIR}/usr/share/zoneinfo/Europe/Berlin ${BINDIR}/etc/localtime || die
    330    
    331   [ -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; }
    # Line 341  fix_db_files() Line 348  fix_db_files()
    348   [ ! -f ${DB_ENTRY}/${i} ] && continue   [ ! -f ${DB_ENTRY}/${i} ] && continue
    349   [[ -z $(< ${DB_ENTRY}/${i}) ]] && continue   [[ -z $(< ${DB_ENTRY}/${i}) ]] && continue
    350    
    351   echo "     fixing /$(mlibdir)/incoming from db-entry '${i}' ..."   echo "     fixing /usr/$(mlibdir)/incoming from db-entry '${i}' ..."
    352    
    353   # /lib/incoming -> empty line; sed2 removes all empty lines   # /usr/lib/incoming -> empty line; sed2 removes all empty lines
    354   #sed -i -e "s:/$(mlibdir)/incoming.*::g" -e '/^$/d' ${DB_ENTRY}/${i}   #sed -i -e "s:/$(mlibdir)/incoming.*::g" -e '/^$/d' ${DB_ENTRY}/${i}
    355   # do not simply emtpy the line, but change it the the correct path,   # do not simply emtpy the line, but change it the the correct path,
    356   # so no stale libs are around if the package gets updated!   # so no stale libs are around if the package gets updated!
    357   sed -i \   sed -i \
    358   -e "s:/$(mlibdir)/incoming:/$(mlibdir):g" \   -e "s:/usr/$(mlibdir)/incoming:/usr/$(mlibdir):g" \
    359   -e "s:/$(mlibdir)/incoming.*::g" \   -e "s:/usr/$(mlibdir)/incoming.*::g" \
    360   -e '/^$/d' ${DB_ENTRY}/${i}   -e '/^$/d' ${DB_ENTRY}/${i}
    361   done   done
    362  }  }
    # Line 376  postinstall_glibc() Line 383  postinstall_glibc()
    383    
    384   echo "     Switching to new glibc ..."   echo "     Switching to new glibc ..."
    385   # swap libraries on the fly:   # swap libraries on the fly:
    386   if [ -x /sbin/ldconfig -a -d /usr/$(mlibdir)/incoming ] && [[ -z ${MROOT} ]]   if [ -x /usr/sbin/ldconfig -a -d /usr/$(mlibdir)/incoming ] && [[ -z ${MROOT} ]]
    387   then   then
    388   # first create copies of the incoming libraries:   # first create copies of the incoming libraries:
    389   cd /usr/$(mlibdir)/incoming   cd /usr/$(mlibdir)/incoming
    # Line 389  postinstall_glibc() Line 396  postinstall_glibc()
    396   done   done
    397    
    398   # then switch to them all at once:   # then switch to them all at once:
    399   /sbin/ldconfig -l /usr/$(mlibdir)/*.incoming 2> /dev/null   /usr/sbin/ldconfig -l /usr/$(mlibdir)/*.incoming 2> /dev/null
    400    
    401   # finally, rename them and clean up:   # finally, rename them and clean up:
    402   cd /usr/$(mlibdir)   cd /usr/$(mlibdir)
    # Line 397  postinstall_glibc() Line 404  postinstall_glibc()
    404   do   do
    405   rm -f $(basename ${file} .incoming)   rm -f $(basename ${file} .incoming)
    406   cp -a ${file} $(basename ${file} .incoming)   cp -a ${file} $(basename ${file} .incoming)
    407   /sbin/ldconfig -l $(basename ${file} .incoming)   /usr/sbin/ldconfig -l $(basename ${file} .incoming)
    408   rm -f ${file}   rm -f ${file}
    409   done   done
    410    
    Legend:
    Removed from v.3622  
    changed lines
      Added in v.3623