[oe-commits] org.oe.dev gcc-(cross)-package.inc: selective fortran packaging.

[xjqian commit]

gcc-(cross)-package.inc: selective fortran packaging.

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 1aa5367f28f9d932c635b4de64f9c152ffc30570
ViewMTN: http://monotone.openembedded.org/revision/info/1aa5367f28f9d932c635b4de64f9c152ffc30570
Files:
1
packages/gcc/gcc-package-cross.inc
packages/gcc/gcc-package.inc
Diffs:

#
# mt diff -r63bd07100c4d0904c27a64b7a474be0dd371ac7a -r1aa5367f28f9d932c635b4de64f9c152ffc30570
#
# 
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [8362f93518636c0bd48afe15d974c64bd8a2251f]
#    to [02ed46babec84d115ccdf2185b7c2a9364953092]
# 
# patch "packages/gcc/gcc-package.inc"
#  from [fb44f67e25ac9898fae35ea8786446b7969aa444]
#    to [1cc2816065e59a4b33fa88fb69ad95372838e537]
# 
============================================================
--- packages/gcc/gcc-package-cross.inc	8362f93518636c0bd48afe15d974c64bd8a2251f
+++ packages/gcc/gcc-package-cross.inc	02ed46babec84d115ccdf2185b7c2a9364953092
@@ -81,6 +81,6 @@ do_install () {
      
        # Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77
        # gfortran is fully backwards compatible. This is a safe and practical solution. 
-       ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}gfortran ${CROSS_DIR}/bin/${TARGET_PREFIX}g77
-       ln -sf ${CROSS_DIR}/${TARGET_SYS}/bin/gfortran ${CROSS_DIR}/${TARGET_SYS}/bin/g77
+       ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}gfortran ${CROSS_DIR}/bin/${TARGET_PREFIX}g77 || true
+       ln -sf ${CROSS_DIR}/${TARGET_SYS}/bin/gfortran ${CROSS_DIR}/${TARGET_SYS}/bin/g77 || true
 }
============================================================
--- packages/gcc/gcc-package.inc	fb44f67e25ac9898fae35ea8786446b7969aa444
+++ packages/gcc/gcc-package.inc	1cc2816065e59a4b33fa88fb69ad95372838e537
@@ -120,12 +120,12 @@ do_install () {
 	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
 
 	# Symlinks so we can use these trivially on the target
-	ln -sf ${TARGET_SYS}-g77 g77
-	ln -sf ${TARGET_SYS}-gfortran gfortran
+	ln -sf ${TARGET_SYS}-g77 g77 || true
+	ln -sf ${TARGET_SYS}-gfortran gfortran || true
 	ln -sf ${TARGET_SYS}-g++ g++
 	ln -sf ${TARGET_SYS}-gcc gcc
-	ln -sf g77 f77
-	ln -sf gfortran f95
+	ln -sf g77 f77 || true
+	ln -sf gfortran f95 || true
 	ln -sf g++ c++
 	ln -sf gcc cc
 	ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp