Magellan Linux

Diff of /trunk/include/gcc-toolchain.sminc

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

revision 33306 by niro, Tue Oct 29 21:07:32 2019 UTC revision 33340 by niro, Wed Jul 12 20:17:40 2023 UTC
# Line 20  install_gcc_library() Line 20  install_gcc_library()
20    
21   cd ${SRCDIR}/build   cd ${SRCDIR}/build
22   mmake -C ${CHOST}/${library} DESTDIR=${BINDIR} install-toolexeclibLTLIBRARIES || die   mmake -C ${CHOST}/${library} DESTDIR=${BINDIR} install-toolexeclibLTLIBRARIES || die
23   if [[ $(mlibdir) != lib ]]   if [[ ${ARCH} = x86_64 ]]
24   then   then
25   if [ -d ${CHOST}/32/${library} ]   if [ -d ${CHOST}/32/${library} ]
26   then   then
# Line 35  uninstall_gcc_library() Line 35  uninstall_gcc_library()
35    
36   cd ${SRCDIR}/build   cd ${SRCDIR}/build
37   mmake -C ${CHOST}/${library} DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die   mmake -C ${CHOST}/${library} DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die
38   if [[ $(mlibdir) != lib ]]   if [[ ${ARCH} = x86_64 ]]
39   then   then
40   if [ -d ${CHOST}/32/${library} ]   if [ -d ${CHOST}/32/${library} ]
41   then   then
# Line 71  keep_dev_package_libs() Line 71  keep_dev_package_libs()
71   zapmost ${BINDIR}/usr/$(mlibdir) "${libs}" || die   zapmost ${BINDIR}/usr/$(mlibdir) "${libs}" || die
72   fi   fi
73   # multilib as well   # multilib as well
74   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(ARCH=x86_64 mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/$(ARCH=x86_64 mlibdir) ]]
75   then   then
76   zapmost ${BINDIR}/usr/lib "${libs}" || die   zapmost ${BINDIR}/usr/$(ARCH=x86_64 mlibdir) "${libs}" || die
77     fi
78     if [[ $(ARCH=i686 mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/$(ARCH=i686 mlibdir) ]]
79     then
80     zapmost ${BINDIR}/usr/$(ARCH=i686 mlibdir) "${libs}" || die
81   fi   fi
82    
83   # cleanup the rest, keep only libs   # cleanup the rest, keep only libs
84   zapmost ${BINDIR} /usr/$(mlibdir) $([[ $(mlibdir) != lib ]] && echo "/usr/lib") || die   zapmost ${BINDIR} /usr/$(mlibdir) \
85     $([[ $(ARCH=x86_64 mlibdir) != lib ]] && echo "/usr/$(ARCH=x86_64 mlibdir)") \
86     $([[ $(ARCH=i686 mlibdir) != lib ]] && echo "/usr/$(ARCH=i686 mlibdir)")|| die
87  }  }
88    
89  delete_dev_package_libs()  delete_dev_package_libs()
# Line 94  delete_dev_package_libs() Line 100  delete_dev_package_libs()
100   rm ${BINDIR}/usr/$(mlibdir)/${i} || die   rm ${BINDIR}/usr/$(mlibdir)/${i} || die
101   fi   fi
102   # multilib as well   # multilib as well
103   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(ARCH=x86_64 mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/$(ARCH=x86_64 mlibdir) ]]
104     then
105     rm ${BINDIR}/usr/$(ARCH=x86_64 mlibdir)/${i} || die
106     fi
107     if [[ $(ARCH=i686 mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/$(ARCH=i686 mlibdir) ]]
108   then   then
109   rm ${BINDIR}/usr/lib/${i} || die   rm ${BINDIR}/usr/$(ARCH=i686 mlibdir)/${i} || die
110   fi   fi
111   done   done
112  }  }

Legend:
Removed from v.33306  
changed lines
  Added in v.33340