gcc: change the way to package fortran, reduce spurious variables, make missing fortr...

diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 4e380c5f664d54e1e2178fbdf3cb3367e2214768..0d3e5de6f4d3ce283a5ff5183fc251d3ad03e901 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"

diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 08bc3a836e4dbd217c2fb93f141e53a3a48f3835..b9267f79738a9ee353ab872b44a6d6dce40d3d72 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r12"
+PR = "r13"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"

diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index 34f083b11173fbd27d912c7655e4b93939bee5c6..e67d6c6b7a865d4867b4cbc0daa10e62737e9992 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r7"
+PR = "r8"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"

diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 9433c237f48b7fc5161d436691df95081f7111cb..003fd9e79eaa7df87df046293e63815292856972 100644 (file)
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"

diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index a7a49081205532d80d8cc77c007759b084146db9..fa1b1247f5ac6061c9add9075cca13074548e882 100644 (file)
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -1,8 +1,6 @@
 # Packages emitted by our gcc-cross builds.
 #
 INHIBIT_PACKAGE_STRIP ?= ""
-HAS_G2C ?= "yes"
-HAS_GFORTRAN ?= "no"
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
@@ -53,12 +51,8 @@ do_install () {
        # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
        mkdir -p ${D}${target_libdir}
        mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir}
-       if [ "${HAS_G2C}" = "yes" ]; then
-         mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
-       fi
-       if [ "${HAS_GFORTRAN}" = "yes" ]; then
-         mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir}
-       fi
+       mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
+       mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true
 
        # Manually run the target stripper since we won't get it run by
        # the packaging.
@@ -66,5 +60,6 @@ do_install () {
                ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.*
                ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* || true
                ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.*
-       fi
+               ${TARGET_PREFIX}strip ${D}${target_libdir}/libgfortran*.so* || true
+       fi
 }

diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc
index a910a8dc4de3bf5a04555038ff9c190f8a2af69b..c3ba231678cd59942b14e2489cc05c503c4fbb42 100644 (file)
--- a/packages/gcc/gcc-package-sdk.inc
+++ b/packages/gcc/gcc-package-sdk.inc
@@ -1,8 +1,6 @@
 # Packages emitted by our gcc-cross builds.
 #
 INHIBIT_PACKAGE_STRIP ?= ""
-HAS_G2C ?= "yes"
-HAS_GFORTRAN ?= "no"
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 

diff --git a/packages/gcc/gcc4-build.inc b/packages/gcc/gcc4-build.inc
index b8a214a590d26f23edb0111c3ff86347d6aa88fa..f745ad22ab2e8c51a48b320a155807cf7154535c 100644 (file)
--- a/packages/gcc/gcc4-build.inc
+++ b/packages/gcc/gcc4-build.inc
@@ -1,6 +1,4 @@
 FORTRAN = ",f95"
-HAS_GFORTRAN ?= "yes"
-HAS_G2C = "no"
 
 include gcc3-build.inc
 

diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 0541ddfe9658daa38b06e95041fae90cdbba3e5b..1d7d8242fecbfa76bab2d52571edd04fa45aa65b 100644 (file)
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -35,5 +35,3 @@ require gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
 FORTRAN = ""
-HAS_GFORTRAN = ""
-HAS_G2C = "no"

diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 47253cc8d56c5ef9165cbd38d5dff2210e292856..3a4eaf9d3b1c0d0688e09c05acb6497b13b10f5a 100644 (file)
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -21,7 +21,5 @@ require gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
 FORTRAN = ""
-HAS_GFORTRAN = ""
-HAS_G2C = "no"
 
 

diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 9135daca18ae1ef2d33d699b25f6b46ca1a86db4..1a03ce617e50f4953e346c0d45ccb26bd9db0a9c 100644 (file)
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -46,8 +46,6 @@ SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \
 #Set the fortran bits
 # 'fortran' or '', not 'f77' like gcc3 had
 FORTRAN = ""
-HAS_GFORTRAN = "no"
-HAS_G2C = "no"
 
 #Set the java bits
 JAVA_arm = ""

diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 9e05ae638c1f17941fff1142856e1736ffb56870..1d76a48d3bfbf6c22976f9dec8cfb19f864cebcd 100644 (file)
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -39,9 +39,6 @@ SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
 # ',fortran' or '', not 'f77' like gcc3 had
 FORTRAN = ""
 FORTRAN_linux-gnueabi = ",fortran"
-HAS_GFORTRAN = "no"
-HAS_GFORTRAN_linux-gnueabi = "yes"
-HAS_G2C = "yes"
 
 #Set the java bits
 JAVA = ""

diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb
index a4ac7a99a4c4a7c220fe9bca2d55629a0604cc49..07f4b0db0cb997c703140a8edecac8f64aac6e6d 100644 (file)
--- a/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -64,9 +64,6 @@ SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
 # 'i,fortran' or '', not 'f77' like gcc3 had
 FORTRAN = ""
 FORTRAN_linux-gnueabi = ",fortran"
-HAS_GFORTRAN = "no"
-HAS_GFORTRAN_linux-gnueabi = "yes"
-HAS_G2C = "yes"
 
 #Set the java bits
 JAVA = ""