Magellan Linux

Diff of /smage/trunk/core/glibc/glibc-2.27-r5.smage2

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

revision 13756 by niro, Thu Aug 15 09:48:00 2019 UTC revision 13757 by niro, Thu Aug 15 11:23:04 2019 UTC
# Line 277  src_install_glibc() Line 277  src_install_glibc()
277   maddconfig "LDPATH=\"/opt/$(mlibdir)\"" || die   maddconfig "LDPATH=\"/opt/$(mlibdir)\"" || die
278   fi   fi
279    
280   # strip all binaries  # # strip all binaries
281   find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep -v "pie executable" | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-unneeded || die  # find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep -v "pie executable" | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-unneeded || die
282    #
283   # strip all libraries  # # strip all libraries
284   # want to be safe here; --strip-unneeded seems to cause pthread problems  # # want to be safe here; --strip-unneeded seems to cause pthread problems
285   # strip all but libpthread, libc and ld  # # strip all but libpthread, libc and ld
286   install -d ${BUILDDIR}/thread-backup/$(mlibdir) || die  # install -d ${BUILDDIR}/thread-backup/$(mlibdir) || die
287   mv ${BINDIR}/usr/$(mlibdir)/lib{pthread,thread_db,c-}* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die  # mv ${BINDIR}/usr/$(mlibdir)/lib{pthread,thread_db,c-}* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die
288   mv ${BINDIR}/usr/$(mlibdir)/ld-* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die  # mv ${BINDIR}/usr/$(mlibdir)/ld-* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die
289   if [[ ${ARCH} = x86_64 ]]  # if [[ ${ARCH} = x86_64 ]]
290   then  # then
291   install -d ${BUILDDIR}/thread-backup/lib || die  # install -d ${BUILDDIR}/thread-backup/lib || die
292   mv ${BINDIR}/usr/lib/lib{pthread,thread_db,c-}* ${BUILDDIR}/thread-backup/lib/ || die  # mv ${BINDIR}/usr/lib/lib{pthread,thread_db,c-}* ${BUILDDIR}/thread-backup/lib/ || die
293   mv ${BINDIR}/usr/lib/ld-* ${BUILDDIR}/thread-backup/lib/ || die  # mv ${BINDIR}/usr/lib/ld-* ${BUILDDIR}/thread-backup/lib/ || die
294   fi  # fi
295    #
296   # now strip but only debuging symbols  # # now strip but only debuging symbols
297   find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep "[shared object|pie executable]" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-debug || die  # find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep "[shared object|pie executable]" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-debug || die
298   find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep "ar archive" | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-debug || die  # find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep "ar archive" | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-debug || die
299   mv -f ${BUILDDIR}/thread-backup/$(mlibdir)/* ${BINDIR}/usr/$(mlibdir)/ || die  # mv -f ${BUILDDIR}/thread-backup/$(mlibdir)/* ${BINDIR}/usr/$(mlibdir)/ || die
300   if [[ ${ARCH} = x86_64 ]]  # if [[ ${ARCH} = x86_64 ]]
301   then  # then
302   mv -f ${BUILDDIR}/thread-backup/lib/* ${BINDIR}/usr/lib/ || die  # mv -f ${BUILDDIR}/thread-backup/lib/* ${BINDIR}/usr/lib/ || die
303   fi  # fi
304   # remove stale directory  # # remove stale directory
305   rm -rf ${BUILDDIR}/thread-backup || die  # rm -rf ${BUILDDIR}/thread-backup || die
306    
307   # prepare glibc for installation; slackware method   # prepare glibc for installation; slackware method
308   minstalldir /incoming || die   minstalldir /incoming || die
# Line 395  src_install_glibc-dev() Line 395  src_install_glibc-dev()
395   [ -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; }
396   [ -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; }
397    
398   # strip all binaries  # # strip all binaries
399   find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep -v "pie executable" | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-unneeded || die  # find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep -v "pie executable" | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-unneeded || die
400    #
401   # now strip but only debuging symbols  # # now strip but only debuging symbols
402   find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep "[shared object|pie executable]" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-debug || die  # find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep "[shared object|pie executable]" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-debug || die
403   find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep "ar archive" | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-debug || die  # find ${BINDIR} ! -type d | xargs --no-run-if-empty file | grep "ar archive" | cut -f 1 -d : | xargs --no-run-if-empty strip --strip-debug || die
404  }  }
405    
406  src_install_glibc-locale-de()  src_install_glibc-locale-de()

Legend:
Removed from v.13756  
changed lines
  Added in v.13757