[oe-commits] Khem Raj : gcc-package-cross: Creative relative symbolic link to fortran and only if fortran is available

GIT User account git at amethyst.openembedded.net
Wed Dec 10 20:10:15 UTC 2008 

Module: openembedded.git
Branch: org.openembedded.dev
Commit: fca5cadc1e2012f01afcdd67d9482a4c52aa52d1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fca5cadc1e2012f01afcdd67d9482a4c52aa52d1

Author: Khem Raj <raj.khem at gmail.com>
Date:   Wed Dec 10 12:05:30 2008 -0800

gcc-package-cross: Creative relative symbolic link to fortran and only if fortran is available

* This patch adds the symbolic link only if fortran is enabled in gcc and secondly it creates
  them relative and not absolute as they are right now.

---

 packages/gcc/gcc-cross_3.3.3.bb          |    2 +-
 packages/gcc/gcc-cross_3.3.4.bb          |    2 +-
 packages/gcc/gcc-cross_3.4.3.bb          |    2 +-
 packages/gcc/gcc-cross_3.4.4.bb          |    2 +-
 packages/gcc/gcc-cross_4.0.0.bb          |    2 +-
 packages/gcc/gcc-cross_4.0.2.bb          |    2 +-
 packages/gcc/gcc-cross_4.1.0.bb          |    2 +-
 packages/gcc/gcc-cross_4.1.1.bb          |    2 +-
 packages/gcc/gcc-cross_4.1.2.bb          |    2 +-
 packages/gcc/gcc-cross_4.2.1.bb          |    2 +-
 packages/gcc/gcc-cross_4.2.2.bb          |    2 +-
 packages/gcc/gcc-cross_4.2.3.bb          |    2 +-
 packages/gcc/gcc-cross_4.2.4.bb          |    2 +-
 packages/gcc/gcc-cross_4.3.1.bb          |    2 +-
 packages/gcc/gcc-cross_4.3.2.bb          |    2 +-
 packages/gcc/gcc-cross_csl-arm-2005q3.bb |    2 +-
 packages/gcc/gcc-cross_csl-arm-2006q1.bb |    2 +-
 packages/gcc/gcc-cross_csl-arm-2007q3.bb |    2 +-
 packages/gcc/gcc-cross_csl-arm-2008q1.bb |    2 +-
 packages/gcc/gcc-cross_csl-arm-2008q3.bb |    2 +-
 packages/gcc/gcc-package-cross.inc       |   12 +++++++++---
 21 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index 3848864..73ae287 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index 1f5e5f7..6513704 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,4 +1,4 @@
-PR ="r8"
+PR ="r9"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index 271509b..83319f1 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,4 +1,4 @@
-PR = "r16"
+PR = "r17"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index e2b20df..ccc2cee 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r12"
+PR = "r13"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index dd3fbbc..e192d82 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index bb4c6f0..5324ee0 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,4 +1,4 @@
-PR = "r13"
+PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 33042da..71aeac3 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index da79759..fb4ee71 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r22"
+PR = "r23"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index b3c6437..51a5c8a 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r18"
+PR = "r19"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 5986fad..2df95c2 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,4 +1,4 @@
-PR = "r18"
+PR = "r19"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index fe25ae2..a24370f 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "r12"
+PR = "r13"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.3.bb b/packages/gcc/gcc-cross_4.2.3.bb
index 4149179..dc3ee94 100644
--- a/packages/gcc/gcc-cross_4.2.3.bb
+++ b/packages/gcc/gcc-cross_4.2.3.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.4.bb b/packages/gcc/gcc-cross_4.2.4.bb
index f51e60c..9821d3c 100644
--- a/packages/gcc/gcc-cross_4.2.4.bb
+++ b/packages/gcc/gcc-cross_4.2.4.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.3.1.bb b/packages/gcc/gcc-cross_4.3.1.bb
index 7a08d62..a6ebecb 100644
--- a/packages/gcc/gcc-cross_4.3.1.bb
+++ b/packages/gcc/gcc-cross_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "r16"
+PR = "r17"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.3.2.bb b/packages/gcc/gcc-cross_4.3.2.bb
index 18d5abd..9f1ffed 100644
--- a/packages/gcc/gcc-cross_4.3.2.bb
+++ b/packages/gcc/gcc-cross_4.3.2.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 require gcc-configure-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 858459c..5fa278d 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-csl-arm-2005q3.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2006q1.bb b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
index a8c662e..5cb1633 100644
--- a/packages/gcc/gcc-cross_csl-arm-2006q1.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-csl-arm-2006q1.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/packages/gcc/gcc-cross_csl-arm-2007q3.bb
index 6ae4278..2230413 100644
--- a/packages/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 require gcc-csl-arm-2007q3.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
index 69127da..60cf2da 100644
--- a/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 require gcc-csl-arm-2008q1.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2008q3.bb b/packages/gcc/gcc-cross_csl-arm-2008q3.bb
index d2a1102..bbd4cdf 100644
--- a/packages/gcc/gcc-cross_csl-arm-2008q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2008q3.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require gcc-csl-arm-2008q3.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index b95ef88..a16f21a 100644
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -63,7 +63,13 @@ do_install () {
 	fi
      
        # 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 || true
-       ln -sf ${CROSS_DIR}/${TARGET_SYS}/bin/gfortran ${CROSS_DIR}/${TARGET_SYS}/bin/g77 || true
+       # gfortran is fully backwards compatible. This is a safe and practical solution.
+       if [ -f ${CROSS_DIR}/bin/${TARGET_PREFIX}gfortran ]; then
+              currdir = $PWD
+              cd ${CROSS_DIR}/bin/
+              ln -sf ${TARGET_PREFIX}gfortran ${TARGET_PREFIX}g77 || true
+              cd ${CROSS_DIR}/${TARGET_SYS}/bin/
+              ln -sf gfortran g77 || true
+              cd $currdir
+       fi
 }

More information about the Openembedded-commits mailing list