Magellan Linux

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

    Diff of /smage/trunk/core/gcc/gcc-9.2.0-r1.smage2

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

    revision 13756 by niro, Thu Aug 15 10:52:12 2019 UTC revision 13764 by niro, Tue Oct 29 18:32:41 2019 UTC
    # Line 161  then Line 161  then
    161   ADA_DEPEND="${COMMON_DEPEND}"   ADA_DEPEND="${COMMON_DEPEND}"
    162   if [[ ${ADA_BOOTSTRAP} = 1 ]]   if [[ ${ADA_BOOTSTRAP} = 1 ]]
    163   then   then
    164   GNAT_BIN_x86="gnatboot-7.2-i686.tar.bz2"   GNAT_BIN_x86="gnatboot-7.2-i686.tar.xz"
    165   GNAT_BIN_x86_64="gnatboot-7.2-amd64.tar.bz2"   GNAT_BIN_x86_64="gnatboot-7.2-amd64.tar.xz"
    166   GNAT_BIN="$(eval echo \$GNAT_BIN_${ARCH/i*86/x86})"   GNAT_BIN="$(eval echo \$GNAT_BIN_${ARCH/i*86/x86})"
    167   GNAT_BIN_SRCDIR="${BUILDDIR}/gnat"   GNAT_BIN_SRCDIR="${BUILDDIR}/gnat"
    168   SRC_URI+=( mirror://${_BASENAME}/${GNAT_BIN_x86} )   SRC_URI+=( mirror://${_BASENAME}/${GNAT_BIN_x86} )
    # Line 831  src_compile() Line 831  src_compile()
    831   # no ssp, we use mpx   # no ssp, we use mpx
    832   myconf+=" --disable-libssp"   myconf+=" --disable-libssp"
    833    
    834    # hack: just use empty pkgs for x86_64 arch
    835  # # enforce vtable verification  # # enforce vtable verification
    836  # myconf+=" --enable-vtable-verify"  # myconf+=" --enable-vtable-verify"
    837  # myconf+=" --enable-libvtv"  # myconf+=" --enable-libvtv"
    # Line 1376  then Line 1377  then
    1377    
    1378   src_install_libvtv-common()   src_install_libvtv-common()
    1379   {   {
    1380   # hack - fix empty libvtv on i686, if build was not enforced   # hack - always create the bindir to get empty pkgs at least on x86_64 platforms
    1381   install -d ${BINDIR} || die   install -d ${BINDIR} || die
    1382    
    1383   install_gcc_library "libvtv" || die   install_gcc_library "libvtv" || die
    1384   }   }
    1385    
    # Line 1386  then Line 1388  then
    1388   src_install_libvtv-common || die   src_install_libvtv-common || die
    1389   if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]   if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]
    1390   then   then
    1391   # only keep/remove libvtv if libdir was found   keep_dev_package_libs 'libvtv.so.*' || die
      if [ -d ${BINDIR}/usr/$(mlibdir) ]  
      then  
      keep_dev_package_libs 'libvtv.so.*' || die  
      fi  
    1392   fi   fi
    1393   }   }
    1394    
    1395   src_install_libvtv-dev()   src_install_libvtv-dev()
    1396   {   {
    1397   src_install_libvtv-common || die   src_install_libvtv-common || die
    1398   # only keep/remove libvtv if libdir was found   delete_dev_package_libs 'libvtv.so.*' || die
      if [ -d ${BINDIR}/usr/$(mlibdir) ]  
      then  
      delete_dev_package_libs 'libvtv.so.*' || die  
      fi  
    1399   }   }
    1400  fi  fi
    1401    
    # Line 1562  then Line 1556  then
    1556   # install 32bit libgnat   # install 32bit libgnat
    1557   # make tries to execute the libs, which fails   # make tries to execute the libs, which fails
    1558   # we override the INSTALL commands to *not* do that   # we override the INSTALL commands to *not* do that
    1559   mmake -C ${CHOST}/32/libada DESTDIR=${BINDIR} INSTALL="install" INSTALL_DATA="install -m0644" install-gnatlib || die   mmake -C ${CHOST}/32/libada DESTDIR=${BINDIR} INSTALL="install" INSTALL_DATA="install -m0644" install-libada || die
    1560   fi   fi
    1561   mmake -C gcc DESTDIR=${BINDIR} ada.install-info || die   mmake -C gcc DESTDIR=${BINDIR} ada.install-info || die
    1562   minstallexec gcc/gnat1 /usr/$(mlibdir)/gcc/${CHOST}/${PVER} || die   minstallexec gcc/gnat1 /usr/$(mlibdir)/gcc/${CHOST}/${PVER} || die
    Legend:
    Removed from v.13756  
    changed lines
      Added in v.13764