Magellan Linux

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

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

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

    revision 13742 by niro, Wed Aug 7 09:13:51 2019 UTC revision 13747 by niro, Wed Aug 7 20:36:26 2019 UTC
    # Line 73  fi Line 73  fi
    73  [[ -z ${ALT_HEADERS} ]] && export ALT_HEADERS="/usr/include"  [[ -z ${ALT_HEADERS} ]] && export ALT_HEADERS="/usr/include"
    74    
    75  # kernel support  # kernel support
    76  export ENABLE_KERNEL=3.2.0  #export ENABLE_KERNEL=3.2.0
    77    
    78  split_info_glibc()  split_info_glibc()
    79  {  {
    # Line 107  src_prepare() Line 107  src_prepare()
    107   cd ${SRCDIR}   cd ${SRCDIR}
    108    
    109   # fix a test case that fails when built using gcc-5.x   # fix a test case that fails when built using gcc-5.x
    110   sed -i '/tst-audit2-ENV/i CFLAGS-tst-audit2.c += -fno-builtin' elf/Makefile || die   #sed -i '/tst-audit2-ENV/i CFLAGS-tst-audit2.c += -fno-builtin' elf/Makefile || die
    111    
    112   # fixes an infinite loop while syscall.d creation   # fixes an infinite loop while syscall.d creation
    113   # see: http://sourceware.org/bugzilla/show_bug.cgi?id=15711   # see: http://sourceware.org/bugzilla/show_bug.cgi?id=15711
    # Line 121  src_prepare() Line 121  src_prepare()
    121   #  /usr/src/glibc-2.16.0.bld/   #  /usr/src/glibc-2.16.0.bld/
    122   #  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>   #  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>
    123   #  line 1   #  line 1
    124   sed -i 's:CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)::' Makefile || die   #sed -i 's:CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)::' Makefile || die
    125    
    126   # binutils patch needs reconf   # binutils patch needs reconf
    127  # autoconf --force || die  # autoconf --force || die
    # Line 152  src_compile() Line 152  src_compile()
    152   # enable addons   # enable addons
    153   myopts+=" --enable-add-ons"   myopts+=" --enable-add-ons"
    154   # supported kernel-release   # supported kernel-release
    155   myopts+=" --enable-kernel=${ENABLE_KERNEL}"   #myopts+=" --enable-kernel=${ENABLE_KERNEL}"
    156   # disable cvs and gd support   # disable cvs and gd support
    157   myopts+=" --without-cvs --without-gd"   myopts+=" --without-cvs --without-gd"
    158   # enable bindnow   # enable bindnow
    # Line 174  src_compile() Line 174  src_compile()
    174   # enable static pie   # enable static pie
    175   myopts+=" --enable-static-pie"   myopts+=" --enable-static-pie"
    176   # enable intel cet + branch tracking (IBT) and shadow stack (SHSTK)   # enable intel cet + branch tracking (IBT) and shadow stack (SHSTK)
    177   myopts+=" --enable-cet"  # myopts+=" --enable-cet"
    178    
    179   # remove fortify for building libraries   # remove fortify for building libraries
    180   export CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}   export CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
    # Line 289  src_install_glibc() Line 289  src_install_glibc()
    289   install -d ${BUILDDIR}/thread-backup/$(mlibdir) || die   install -d ${BUILDDIR}/thread-backup/$(mlibdir) || die
    290   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
    291   mv ${BINDIR}/usr/$(mlibdir)/ld-* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die   mv ${BINDIR}/usr/$(mlibdir)/ld-* ${BUILDDIR}/thread-backup/$(mlibdir)/ || die
    292     if [[ ${ARCH} = x86_64 ]]
    293     then
    294     install -d ${BUILDDIR}/thread-backup/lib || die
    295     mv ${BINDIR}/usr/lib/lib{pthread,thread_db,c-}* ${BUILDDIR}/thread-backup/lib/ || die
    296     mv ${BINDIR}/usr/lib/ld-* ${BUILDDIR}/thread-backup/lib/ || die
    297     fi
    298    
    299   # now strip   # now strip but only debuging symbols
    300   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
    301   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
    302   mv -f ${BUILDDIR}/thread-backup/* ${BINDIR}/usr/$(mlibdir)/ || die   mv -f ${BUILDDIR}/thread-backup/$(mlibdir)/* ${BINDIR}/usr/$(mlibdir)/ || die
    303     if [[ ${ARCH} = x86_64 ]]
    304     then
    305     mv -f ${BUILDDIR}/thread-backup/lib/* ${BINDIR}/usr/lib/ || die
    306     fi
    307   # remove stale directory   # remove stale directory
    308   rm -rf ${BUILDDIR}/thread-backup || die   rm -rf ${BUILDDIR}/thread-backup || die
    309    
    Legend:
    Removed from v.13742  
    changed lines
      Added in v.13747