Magellan Linux

Diff of /trunk/core/gcc/gcc-8.1.0-r1.smage2

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

revision 30965 by niro, Tue May 22 14:39:39 2018 UTC revision 30966 by niro, Wed May 23 08:47:12 2018 UTC
# Line 75  SPECIAL_VARS="DEPEND_x86_64" Line 75  SPECIAL_VARS="DEPEND_x86_64"
75    
76  if lang_enabled c  if lang_enabled c
77  then  then
78   SPLIT_PACKAGES+="libgcc libgomp libquadmath libitm libatomic libasan libubsan libcilkrts libvtv libmpx"   SPLIT_PACKAGES+="libgcc libgomp libquadmath libitm libatomic libasan libubsan libvtv libmpx"
79   if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]   if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]
80   then   then
81   SPLIT_PACKAGES+=" libgcc-dev libgomp-dev libquadmath-dev libitm-dev libatomic-dev libasan-dev libubsan-dev libcilkrts-dev libvtv-dev libmpx-dev"   SPLIT_PACKAGES+=" libgcc-dev libgomp-dev libquadmath-dev libitm-dev libatomic-dev libasan-dev libubsan-dev libvtv-dev libmpx-dev"
82   fi   fi
83   # thread/leak sanitizer is only available on x86_64   # thread/leak sanitizer is only available on x86_64
84   if [[ ${ARCH} = x86_64 ]]   if [[ ${ARCH} = x86_64 ]]
# Line 99  then Line 99  then
99   LIBLSAN_DEPEND="${GLIBC_DEPEND}"   LIBLSAN_DEPEND="${GLIBC_DEPEND}"
100   LIBUBSAN_DEPEND="${GLIBC_DEPEND}"   LIBUBSAN_DEPEND="${GLIBC_DEPEND}"
101   LIBTSAN_DEPEND="${GLIBC_DEPEND}"   LIBTSAN_DEPEND="${GLIBC_DEPEND}"
  LIBCILKRTS_DEPEND="${GLIBC_DEPEND}"  
102   LIBVTV_DEPEND="${GLIBC_DEPEND}"   LIBVTV_DEPEND="${GLIBC_DEPEND}"
103   LIBMPX_DEPEND="${GLIBC_DEPEND}"   LIBMPX_DEPEND="${GLIBC_DEPEND}"
104   GCC_DEPEND="${COMMON_DEPEND}   GCC_DEPEND="${COMMON_DEPEND}
# Line 223  SDEPEND="${LIBGCC_DEPEND} Line 222  SDEPEND="${LIBGCC_DEPEND}
222   ${LIBLSAN_DEPEND}   ${LIBLSAN_DEPEND}
223   ${LIBUBSAN_DEPEND}   ${LIBUBSAN_DEPEND}
224   ${LIBTSAN_DEPEND}   ${LIBTSAN_DEPEND}
  ${LIBCILKRTS_DEPEND}  
225   ${LIBVTV_DEPEND}   ${LIBVTV_DEPEND}
226   ${LIBMPX_DEPEND}   ${LIBMPX_DEPEND}
227   ${LIBSTDCPP_DEPEND}   ${LIBSTDCPP_DEPEND}
# Line 313  then Line 311  then
311   == sys-libs/libatomic-${PVER}   == sys-libs/libatomic-${PVER}
312   == sys-libs/libasan-${PVER}   == sys-libs/libasan-${PVER}
313   == sys-libs/libubsan-${PVER}   == sys-libs/libubsan-${PVER}
  == sys-libs/libcilkrts-${PVER}  
314   == sys-libs/libvtv-${PVER}   == sys-libs/libvtv-${PVER}
315   == sys-libs/libmpx-${PVER}   == sys-libs/libmpx-${PVER}
316   $(marchdepend)   $(marchdepend)
# Line 329  then Line 326  then
326   == sys-libs/libatomic-dev-${PVER}   == sys-libs/libatomic-dev-${PVER}
327   == sys-libs/libasan-dev-${PVER}   == sys-libs/libasan-dev-${PVER}
328   == sys-libs/libubsan-dev-${PVER}   == sys-libs/libubsan-dev-${PVER}
  == sys-libs/libcilkrts-dev-${PVER}  
329   == sys-libs/libvtv-dev-${PVER}   == sys-libs/libvtv-dev-${PVER}
330   == sys-libs/libmpx-dev-${PVER}"   == sys-libs/libmpx-dev-${PVER}"
331   fi   fi
# Line 484  then Line 480  then
480   PCAT="sys-libs"   PCAT="sys-libs"
481   }   }
482    
  split_info_libcilkrts()  
  {  
  DESCRIPTION="The Cilk+ runtime library."  
  DEPEND="== sys-libs/libgcc-${PVER}  
  == sys-libs/libstdc++-${PVER}  
  ${LIBCILKRTS_DEPEND}"  
  PCAT="sys-libs"  
  }  
   
  split_info_libcilkrts-dev()  
  {  
  DESCRIPTION="Development files for libcilkrts."  
  DEPEND="== sys-libs/libcilkrts-${PVER}  
  == sys-libs/libgcc-dev-${PVER}  
  == sys-libs/libstdc++-dev-${PVER}"  
  PCAT="sys-libs"  
  }  
   
483   split_info_libvtv()   split_info_libvtv()
484   {   {
485   DESCRIPTION="Vtable Verification runtime library."   DESCRIPTION="Vtable Verification runtime library."
# Line 998  then Line 976  then
976   mlink /usr/$(mlibdir)/gcc/${CHOST}/${PVER}/liblto_plugin.so /usr/$(mlibdir)/bfd-plugins/ || die   mlink /usr/$(mlibdir)/gcc/${CHOST}/${PVER}/liblto_plugin.so /usr/$(mlibdir)/bfd-plugins/ || die
977   fi   fi
978    
979   # library headers: libcilkrts, libgomp, libitm, libsanitizer, libasan, libmpx   # library headers: libgomp, libitm, libsanitizer, libasan, libmpx
  mmake -C ${CHOST}/libcilkrts DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die  
  mmake -C ${CHOST}/libcilkrts DESTDIR=${BINDIR} install-nodist_cilkincludeHEADERS || die  
980   mmake -C ${CHOST}/libgomp DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die   mmake -C ${CHOST}/libgomp DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die
981   mmake -C ${CHOST}/libgomp DESTDIR=${BINDIR} install-nodist_libsubincludeHEADERS || die   mmake -C ${CHOST}/libgomp DESTDIR=${BINDIR} install-nodist_libsubincludeHEADERS || die
982   mmake -C ${CHOST}/libitm DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die   mmake -C ${CHOST}/libitm DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die
# Line 1011  then Line 987  then
987   mmake -C ${CHOST}/libmpx DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die   mmake -C ${CHOST}/libmpx DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die
988   if [[ $(mlibdir) != lib ]]   if [[ $(mlibdir) != lib ]]
989   then   then
  mmake -C ${CHOST}/32/libcilkrts DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die  
990   mmake -C ${CHOST}/32/libgomp DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die   mmake -C ${CHOST}/32/libgomp DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die
991   mmake -C ${CHOST}/32/libitm DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die   mmake -C ${CHOST}/32/libitm DESTDIR=${BINDIR} install-nodist_toolexeclibHEADERS || die
992   mmake -C ${CHOST}/32/libsanitizer DESTDIR=${BINDIR} install-nodist_sanincludeHEADERS || die   mmake -C ${CHOST}/32/libsanitizer DESTDIR=${BINDIR} install-nodist_sanincludeHEADERS || die
# Line 1420  then Line 1395  then
1395   delete_dev_package_libs 'libtsan.so.*' || die   delete_dev_package_libs 'libtsan.so.*' || die
1396   }   }
1397    
  src_install_libcilkrts-common()  
  {  
  install_gcc_library "libcilkrts" || die  
  }  
   
  src_install_libcilkrts()  
  {  
  src_install_libcilkrts-common || die  
  if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]  
  then  
  keep_dev_package_libs 'libcilkrts.so.*' || die  
  fi  
  }  
   
  src_install_libcilkrts-dev()  
  {  
  src_install_libcilkrts-common || die  
  delete_dev_package_libs 'libcilkrts.so.*' || die  
  }  
   
1398   src_install_libvtv-common()   src_install_libvtv-common()
1399   {   {
1400   install_gcc_library "libvtv" || die   install_gcc_library "libvtv" || die

Legend:
Removed from v.30965  
changed lines
  Added in v.30966