Magellan Linux

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

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

revision 3607 by niro, Tue Jul 10 07:54:53 2012 UTC revision 3608 by niro, Tue Jul 10 14:30:44 2012 UTC
# Line 19  MyLanguages=c,c++ Line 19  MyLanguages=c,c++
19  # 0=no bootstrap, build ada with system gnat - needs sys-dev/gnat  # 0=no bootstrap, build ada with system gnat - needs sys-dev/gnat
20  ADA_BOOTSTRAP="0"  ADA_BOOTSTRAP="0"
21    
22  SPLIT_PACKAGES="libgcc libssp libgomp libquadmath libstdc++ gcc"  SPLIT_PACKAGES="libgcc libgcc-dev libssp libssp-dev libgomp libgomp-dev libquadmath libquadmath-dev libstdc++ libstdc++-dev gcc"
23    
24  # helper functions  # helper functions
25  lang_enabled()  lang_enabled()
# Line 48  versionize_all_bins() Line 48  versionize_all_bins()
48    
49  if lang_enabled java  if lang_enabled java
50  then  then
51   SPLIT_PACKAGES+=" libgcj gcc-gcj"   SPLIT_PACKAGES+=" libgcj libgcj-dev gcc-gcj"
52   JAVA_DEPEND=">= dev-java/eclipse-ecj-3.6   JAVA_DEPEND=">= dev-java/eclipse-ecj-3.6
53   >= dev-java/fastjar-0.98   >= dev-java/fastjar-0.98
54   >= sys-apps/file-5   >= sys-apps/file-5
# Line 67  fi Line 67  fi
67    
68  if lang_enabled ada  if lang_enabled ada
69  then  then
70   SPLIT_PACKAGES+=" libgnat gcc-gnat"   SPLIT_PACKAGES+=" libgnat libgnat-dev gcc-gnat"
71   ADA_DEPEND=""   ADA_DEPEND=""
72   if [[ ${ADA_BOOTSTRAP} = 1 ]]   if [[ ${ADA_BOOTSTRAP} = 1 ]]
73   then   then
# Line 82  fi Line 82  fi
82    
83  if lang_enabled fortran  if lang_enabled fortran
84  then  then
85   SPLIT_PACKAGES+=" libgfortran gcc-gfortran"   SPLIT_PACKAGES+=" libgfortran libgfortran-dev gcc-gfortran"
86   FORTRAN_DEPEND=""   FORTRAN_DEPEND=""
87  fi  fi
88    
89  if lang_enabled go  if lang_enabled go
90  then  then
91   SPLIT_PACKAGES+=" libgo gcc-go"   SPLIT_PACKAGES+=" libgo libgo-dev gcc-go"
92   GO_DEPEND=""   GO_DEPEND=""
93  fi  fi
94    
95  if lang_enabled objc  if lang_enabled objc
96  then  then
97   SPLIT_PACKAGES+=" libobjc gcc-objc"   SPLIT_PACKAGES+=" libobjc libobjc-dev gcc-objc"
98   OBJC_DEPEND=""   OBJC_DEPEND=""
99    
100   if lang_enabled obj-c++   if lang_enabled obj-c++
# Line 193  split_info_libgcc() Line 193  split_info_libgcc()
193   PCAT="sys-libs"   PCAT="sys-libs"
194  }  }
195    
196    split_info_libgcc-dev()
197    {
198     DESCRIPTION="Development files for libgcc."
199     DEPEND="== sys-libs/libgcc-${PVER}"
200     PCAT="sys-libs"
201    }
202    
203  split_info_libssp()  split_info_libssp()
204  {  {
205   DESCRIPTION="SSP libraries from GCC."   DESCRIPTION="SSP libraries from GCC."
# Line 200  split_info_libssp() Line 207  split_info_libssp()
207   PCAT="sys-libs"   PCAT="sys-libs"
208  }  }
209    
210    split_info_libssp-dev()
211    {
212     DESCRIPTION="Development files for libssp."
213     DEPEND="== sys-libs/libssp-${PVER}"
214     PCAT="sys-libs"
215    }
216    
217  split_info_libgomp()  split_info_libgomp()
218  {  {
219   DESCRIPTION="GNU OpenMP runtime library."   DESCRIPTION="GNU OpenMP runtime library."
# Line 207  split_info_libgomp() Line 221  split_info_libgomp()
221   PCAT="sys-libs"   PCAT="sys-libs"
222  }  }
223    
224    split_info_libgomp-dev()
225    {
226     DESCRIPTION="Development files for libgomp."
227     DEPEND="== sys-libs/libgomp-${PVER}"
228     PCAT="sys-libs"
229    }
230    
231  split_info_libquadmath()  split_info_libquadmath()
232  {  {
233   DESCRIPTION="GCC __float128 shared support library."   DESCRIPTION="GCC __float128 shared support library."
# Line 214  split_info_libquadmath() Line 235  split_info_libquadmath()
235   PCAT="sys-libs"   PCAT="sys-libs"
236  }  }
237    
238    split_info_libquadmath-dev()
239    {
240     DESCRIPTION="Development files for libquadmath."
241     DEPEND="== sys-libs/libquadmath-${PVER}"
242     PCAT="sys-libs"
243    }
244    
245  split_info_libstdc++()  split_info_libstdc++()
246  {  {
247   DESCRIPTION="Standard GNU C and C++ libraries."   DESCRIPTION="Standard GNU C and C++ libraries."
# Line 222  split_info_libstdc++() Line 250  split_info_libstdc++()
250   PCAT="sys-libs"   PCAT="sys-libs"
251  }  }
252    
253    split_info_libstdc++-dev()
254    {
255     DESCRIPTION="Development files for libstdc++."
256     DEPEND="== sys-libs/libstdc++-${PVER}"
257     PCAT="sys-libs"
258    }
259    
260  if lang_enabled java  if lang_enabled java
261  then  then
262   split_info_libgcj()   split_info_libgcj()
# Line 232  then Line 267  then
267   PCAT="sys-libs"   PCAT="sys-libs"
268   }   }
269    
270     split_info_libgcj-dev()
271     {
272     DESCRIPTION="Development files for libgcj."
273     DEPEND="== sys-libs/libgcj-${PVER}"
274     PCAT="sys-libs"
275     }
276    
277   split_info_gcc-gcj()   split_info_gcc-gcj()
278   {   {
279   DESCRIPTION="Java support for GCC."   DESCRIPTION="Java support for GCC."
280   DEPEND="== sys-libs/libgcc-${PVER}   DEPEND="== sys-libs/libgcc-dev-${PVER}
281   == sys-libs/libstdc++-${PVER}   == sys-libs/libstdc++-dev-${PVER}
282   == sys-libs/libgcj-${PVER}   == sys-libs/libgcj-dev-${PVER}
283   == sys-dev/gcc-${PVER}   == sys-dev/gcc-${PVER}
284   ${JAVA_DEPEND}"   ${JAVA_DEPEND}"
285   }   }
# Line 256  then Line 298  then
298   split_info_gcc-gnat()   split_info_gcc-gnat()
299   {   {
300   DESCRIPTION="Ada 95 support for GCC:"   DESCRIPTION="Ada 95 support for GCC:"
301   DEPEND="== sys-libs/libgcc-${PVER}   DEPEND="== sys-libs/libgcc-dev-${PVER}
302   == sys-libs/libstdc++-${PVER}   == sys-libs/libstdc++-dev-${PVER}
303   == sys-libs/libgnat-${PVER}   == sys-libs/libgnat-${PVER}
304   == sys-dev/gcc-${PVER}   == sys-dev/gcc-${PVER}
305   ${ADA_DEPEND}"   ${ADA_DEPEND}"
# Line 274  then Line 316  then
316   PCAT="sys-libs"   PCAT="sys-libs"
317   }   }
318    
319     split_info_libgfortran-dev()
320     {
321     DESCRIPTION="Development files for libgfortran."
322     DEPEND="== sys-libs/libgfortran-${PVER}"
323     PCAT="sys-libs"
324     }
325    
326   split_info_gcc-gfortran()   split_info_gcc-gfortran()
327   {   {
328   DESCRIPTION="Fortran support for GCC."   DESCRIPTION="Fortran support for GCC."
329   DEPEND="== sys-libs/libgcc-${PVER}   DEPEND="== sys-libs/libgcc-dev-${PVER}
330   == sys-libs/libstdc++-${PVER}   == sys-libs/libstdc++-dev-${PVER}
331   == sys-libs/libgfortran-${PVER}   == sys-libs/libgfortran-dev-${PVER}
332   == sys-dev/gcc-${PVER}   == sys-dev/gcc-${PVER}
333   ${FORTRAN_DEPEND}"   ${FORTRAN_DEPEND}"
334   }   }
# Line 295  then Line 344  then
344   PCAT="sys-libs"   PCAT="sys-libs"
345   }   }
346    
347     split_info_libgo-dev()
348     {
349     DESCRIPTION="Development files for libgo."
350     DEPEND="== sys-libs/libgo-${PVER}"
351     PCAT="sys-libs"
352     }
353    
354   split_info_gcc-go()   split_info_gcc-go()
355   {   {
356   DESCRIPTION="Go support for GCC."   DESCRIPTION="Go support for GCC."
357   DEPEND="== sys-libs/libgcc-${PVER}   DEPEND="== sys-libs/libgcc-dev-${PVER}
358   == sys-libs/libstdc++-${PVER}   == sys-libs/libstdc++-dev-${PVER}
359   == sys-libs/libgo-${PVER}   == sys-libs/libgo-dev-${PVER}
360   == sys-dev/gcc-${PVER}   == sys-dev/gcc-${PVER}
361   ${GO_DEPEND}"   ${GO_DEPEND}"
362   }   }
# Line 316  then Line 372  then
372   PCAT="sys-libs"   PCAT="sys-libs"
373   }   }
374    
375     split_info_libobjc-dev()
376     {
377     DESCRIPTION="Development files for libobjc."
378     DEPEND="== sys-libs/libobjc-${PVER}"
379     PCAT="sys-libs"
380     }
381    
382   split_info_gcc-objc()   split_info_gcc-objc()
383   {   {
384   DESCRIPTION="Objective-C support for GCC."   DESCRIPTION="Objective-C support for GCC."
385   DEPEND="== sys-libs/libgcc-${PVER}   DEPEND="== sys-libs/libgcc-dev-${PVER}
386   == sys-libs/libstdc++-${PVER}   == sys-libs/libstdc++-dev-${PVER}
387   == sys-libs/libobjc-${PVER}   == sys-libs/libobjc-dev-${PVER}
388   == sys-dev/gcc-${PVER}   == sys-dev/gcc-${PVER}
389   ${OBJC_DEPEND}"   ${OBJC_DEPEND}"
390   }   }
# Line 331  then Line 394  then
394   split_info_gcc-objc++()   split_info_gcc-objc++()
395   {   {
396   DESCRIPTION="Objective-C++ support for GCC."   DESCRIPTION="Objective-C++ support for GCC."
397   DEPEND="== sys-libs/libgcc-${PVER}   DEPEND="== sys-libs/libgcc-dev-${PVER}
398   == sys-libs/libstdc++-${PVER}   == sys-libs/libstdc++-dev-${PVER}
399   == sys-libs/libobjc-${PVER}   == sys-libs/libobjc-dev-${PVER}
400   == sys-dev/gcc-${PVER}   == sys-dev/gcc-${PVER}
401   == sys-dev/gcc-objc-${PVER}   == sys-dev/gcc-objc-${PVER}
402   ${OBJCPP_DEPEND}"   ${OBJCPP_DEPEND}"
# Line 635  src_install_libgcc() Line 698  src_install_libgcc()
698   make DESTDIR=${BINDIR} install-target-libgcc || die   make DESTDIR=${BINDIR} install-target-libgcc || die
699    
700   # cleanup, only keep the libs, everything else get provided by the gcc-package   # cleanup, only keep the libs, everything else get provided by the gcc-package
701   zapmost ${BINDIR}/usr/$(mlibdir) libgcc_s*.* || die   zapmost ${BINDIR}/usr/$(mlibdir) libgcc_s.so.* || die
702     # multilib as well
703     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
704     then
705     zapmost ${BINDIR}/usr/lib libgcc_s.so.* || die
706     fi
707    }
708    
709    src_install_libgcc-dev()
710    {
711     cd ${SRCDIR}/build
712     make DESTDIR=${BINDIR} install-target-libgcc || die
713    
714     # cleanup, only keep the libs, everything else get provided by the gcc-package
715     zapmost ${BINDIR}/usr/$(mlibdir) libgcc_s.so libgcc_s.la libgcc_s.a || die
716   # multilib as well   # multilib as well
717   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
718   then   then
719   zapmost ${BINDIR}/usr/lib libgcc_s*.* || die   zapmost ${BINDIR}/usr/lib libgcc_s.so libgcc_s.la libgcc_s.a || die
720   fi   fi
721  }  }
722    
# Line 649  src_install_libssp() Line 726  src_install_libssp()
726   make DESTDIR=${BINDIR} install-target-libssp || die   make DESTDIR=${BINDIR} install-target-libssp || die
727    
728   # cleanup, only keep the libs, everything else get provided by the gcc-package   # cleanup, only keep the libs, everything else get provided by the gcc-package
729   zapmost ${BINDIR}/usr/$(mlibdir) libssp*.* || die   zapmost ${BINDIR}/usr/$(mlibdir) libssp.so.* || die
730     # multilib as well
731     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
732     then
733     zapmost ${BINDIR}/usr/lib libssp.so.* || die
734     fi
735    }
736    
737    src_install_libssp-dev()
738    {
739     cd ${SRCDIR}/build
740     make DESTDIR=${BINDIR} install-target-libssp || die
741    
742     # cleanup, only keep the libs, everything else get provided by the gcc-package
743     zapmost ${BINDIR}/usr/$(mlibdir) libssp.so libssp.la libssp.a || die
744   # multilib as well   # multilib as well
745   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
746   then   then
747   zapmost ${BINDIR}/usr/lib libssp*.* || die   zapmost ${BINDIR}/usr/lib libssp.so libssp.la libssp.a || die
748   fi   fi
749  }  }
750    
# Line 663  src_install_libgomp() Line 754  src_install_libgomp()
754   make DESTDIR=${BINDIR} install-target-libgomp || die   make DESTDIR=${BINDIR} install-target-libgomp || die
755    
756   # cleanup, only keep the libs, everything else get provided by the gcc-package   # cleanup, only keep the libs, everything else get provided by the gcc-package
757   zapmost ${BINDIR}/usr/$(mlibdir) libgomp*.* || die   zapmost ${BINDIR}/usr/$(mlibdir) libgomp.so.* || die
758     # multilib as well
759     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
760     then
761     zapmost ${BINDIR}/usr/lib libgomp.so.* || die
762     fi
763    }
764    
765    src_install_libgomp-dev()
766    {
767     cd ${SRCDIR}/build
768     make DESTDIR=${BINDIR} install-target-libgomp || die
769    
770     # cleanup, only keep the libs, everything else get provided by the gcc-package
771     zapmost ${BINDIR}/usr/$(mlibdir) libgomp.so libgomp.la libgomp.a || die
772   # multilib as well   # multilib as well
773   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
774   then   then
775   zapmost ${BINDIR}/usr/lib libgomp*.* || die   zapmost ${BINDIR}/usr/lib libgomp.so libgomp.la libgomp.a || die
776   fi   fi
777  }  }
778    
# Line 677  src_install_libquadmath() Line 782  src_install_libquadmath()
782   make DESTDIR=${BINDIR} install-target-libquadmath || die   make DESTDIR=${BINDIR} install-target-libquadmath || die
783    
784   # cleanup, only keep the libs, everything else get provided by the gcc-package   # cleanup, only keep the libs, everything else get provided by the gcc-package
785   zapmost ${BINDIR}/usr/$(mlibdir) libquadmath*.* || die   zapmost ${BINDIR}/usr/$(mlibdir) libquadmath.so.* || die
786   # multilib as well   # multilib as well
787   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
788   then   then
789   zapmost ${BINDIR}/usr/lib libquadmath*.* || die   zapmost ${BINDIR}/usr/lib libquadmath.so.* || die
790     fi
791    }
792    
793    src_install_libquadmath-dev()
794    {
795     cd ${SRCDIR}/build
796     make DESTDIR=${BINDIR} install-target-libquadmath || die
797    
798     # cleanup, only keep the libs, everything else get provided by the gcc-package
799     zapmost ${BINDIR}/usr/$(mlibdir) libquadmath.so libquadmath.la libquadmath.a || die
800     # multilib as well
801     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
802     then
803     zapmost ${BINDIR}/usr/lib libquadmath.so libquadmath.la libquadmath.a || die
804   fi   fi
805  }  }
806    
# Line 701  src_install_libstdc++() Line 820  src_install_libstdc++()
820   fi   fi
821    
822   # cleanup, only keep the libs, everything else get provided by the gcc-package   # cleanup, only keep the libs, everything else get provided by the gcc-package
823   zapmost ${BINDIR}/usr/$(mlibdir) libstdc++*.* || die   zapmost ${BINDIR}/usr/$(mlibdir) libstdc++.so.* || die
824   # multilib as well   # multilib as well
825   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
826   then   then
827   zapmost ${BINDIR}/usr/lib libstdc++*.* || die   zapmost ${BINDIR}/usr/lib libstdc++.so.* || die
828   fi   fi
829    
830   # clean up everything else   # clean up everything else
831   zapmost ${BINDIR} /usr/share/gdb/autload usr/$(mlibdir) $([[ $(mlibdir) != lib ]] && echo "usr/lib") || die   zapmost ${BINDIR} usr/$(mlibdir) $([[ $(mlibdir) != lib ]] && echo "usr/lib") || die
832    }
833    
834    src_install_libstdc++-dev()
835    {
836     cd ${SRCDIR}/build
837     make DESTDIR=${BINDIR} install-target-libstdc++-v3 || die
838    
839     # move gdb scripts to a proper location and to pretty-print ldconfig
840     minstalldir /usr/share/gdb/auto-load/usr/$(mlibdir) || die
841     mv ${BINDIR}/usr/$(mlibdir)/libstdc++*gdb.py* ${BINDIR}/usr/share/gdb/auto-load/usr/$(mlibdir)/ || die
842     # multilib as well
843     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
844     then
845     minstalldir /usr/share/gdb/auto-load/usr/lib || die
846     mv ${BINDIR}/usr/lib/libstdc++*gdb.py* ${BINDIR}/usr/share/gdb/auto-load/usr/lib/ || die
847     fi
848    
849     # cleanup, only keep the libs, everything else get provided by the gcc-package
850     zapmost ${BINDIR}/usr/$(mlibdir) libstdc++.so libstdc++.la libstdc++.a || die
851     # multilib as well
852     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
853     then
854     zapmost ${BINDIR}/usr/lib libstdc++.so libstdc++.la libstdc++.a || die
855     fi
856    
857     # clean up everything else
858     zapmost ${BINDIR} usr/share/gdb/auto-load usr/$(mlibdir) $([[ $(mlibdir) != lib ]] && echo "usr/lib") || die
859  }  }
860    
861  if lang_enabled java  if lang_enabled java
# Line 719  then Line 865  then
865   cd ${SRCDIR}/build   cd ${SRCDIR}/build
866   mmake DESTDIR=${BINDIR} install-target-libjava || die   mmake DESTDIR=${BINDIR} install-target-libjava || die
867    
868   zapmost ${BINDIR}/usr/$(mlibdir) libgcj*.* libgij*.* || die   zapmost ${BINDIR}/usr/$(mlibdir) libgcj.so.* libgij.so.* || die
869   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
870   then   then
871   zapmost ${BINDIR}/usr/lib libgcj*.* libgij*.* || die   zapmost ${BINDIR}/usr/lib libgcj.so.* libgij.so.* || die
872     fi
873     # other stuff
874     rm -r ${BINDIR}/usr/{bin,include,share} || die
875     }
876    
877     src_install_libgcj-dev()
878     {
879     cd ${SRCDIR}/build
880     mmake DESTDIR=${BINDIR} install-target-libjava || die
881    
882     zapmost ${BINDIR}/usr/$(mlibdir) libgcj.so libgcj.la libgcj.a libgij.so libgij.la libgij.a || die
883     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
884     then
885     zapmost ${BINDIR}/usr/lib libgcj.so libgcj.la libgcj.a libgij.so libgij.la libgij.a || die
886   fi   fi
887   # other stuff   # other stuff
888   rm -r ${BINDIR}/usr/{bin,include,share} || die   rm -r ${BINDIR}/usr/{bin,include,share} || die
# Line 824  then Line 984  then
984   cd ${SRCDIR}/build   cd ${SRCDIR}/build
985   mmake DESTDIR=${BINDIR} install-target-libgfortran || die   mmake DESTDIR=${BINDIR} install-target-libgfortran || die
986    
987   zapmost ${BINDIR}/usr/$(mlibdir) libgfortran*.* || die   zapmost ${BINDIR}/usr/$(mlibdir) libgfortran.so.* || die
988     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
989     then
990     zapmost ${BINDIR}/usr/lib libgfortran.so.* || die
991     fi
992     }
993    
994     src_install_libgfortran-dev()
995     {
996     cd ${SRCDIR}/build
997     mmake DESTDIR=${BINDIR} install-target-libgfortran || die
998    
999     zapmost ${BINDIR}/usr/$(mlibdir) libgfortran.so libgfortran.la libgfortran.a || die
1000   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
1001   then   then
1002   zapmost ${BINDIR}/usr/lib libgfortran*.* || die   zapmost ${BINDIR}/usr/lib libgfortran.so libgfortran.la libgfortran.a || die
1003   fi   fi
1004   }   }
1005    
# Line 863  then Line 1035  then
1035   cd ${SRCDIR}/build   cd ${SRCDIR}/build
1036   mmake DESTDIR=${BINDIR} install-target-libgo || die   mmake DESTDIR=${BINDIR} install-target-libgo || die
1037    
1038   zapmost ${BINDIR}/usr/$(mlibdir) libgo*.* || die   zapmost ${BINDIR}/usr/$(mlibdir) libgo.so.* || die
1039   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
1040   then   then
1041   zapmost ${BINDIR}/usr/lib libgo*.* || die   zapmost ${BINDIR}/usr/lib libgo.so.* || die
1042     fi
1043     }
1044    
1045     src_install_libgo-dev()
1046     {
1047     cd ${SRCDIR}/build
1048     mmake DESTDIR=${BINDIR} install-target-libgo || die
1049    
1050     zapmost ${BINDIR}/usr/$(mlibdir) libgo.so libgo.la libgo.a || die
1051     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
1052     then
1053     zapmost ${BINDIR}/usr/lib libgo.so libgo.la libgo.a || die
1054   fi   fi
1055   }   }
1056    
# Line 898  then Line 1082  then
1082   cd ${SRCDIR}/build   cd ${SRCDIR}/build
1083   mmake DESTDIR=${BINDIR} install-target-libobjc || die   mmake DESTDIR=${BINDIR} install-target-libobjc || die
1084    
1085   zapmost ${BINDIR}/usr/$(mlibdir) libobjc*.* || die   zapmost ${BINDIR}/usr/$(mlibdir) libobjc.so.* || die
1086     if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
1087     then
1088     zapmost ${BINDIR}/usr/lib libobjc.so.* || die
1089     fi
1090     }
1091    
1092     src_install_libobjc-dev()
1093     {
1094     cd ${SRCDIR}/build
1095     mmake DESTDIR=${BINDIR} install-target-libobjc || die
1096    
1097     zapmost ${BINDIR}/usr/$(mlibdir) libobjc.so libobjc.la libobjc.a || die
1098   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]   if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
1099   then   then
1100   zapmost ${BINDIR}/usr/lib libobjc*.* || die   zapmost ${BINDIR}/usr/lib libobjc.so libobjc.la libobjc.a || die
1101   fi   fi
1102   }   }
1103    

Legend:
Removed from v.3607  
changed lines
  Added in v.3608