[oe-commits] org.oe.dev gcc: change the way to package fortran, reduce spurious variables, make missing fortran files non-fatal

koen commit openembedded-commits at lists.openembedded.org
Wed Sep 19 10:38:08 UTC 2007 

gcc: change the way to package fortran, reduce spurious variables, make missing fortran files non-fatal

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 9d2d4f101ec15557139aebf1b06e02cac699e17d
ViewMTN: http://monotone.openembedded.org/revision/info/9d2d4f101ec15557139aebf1b06e02cac699e17d
Files:
1
packages/gcc/gcc-cross_4.1.0.bb
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-package-cross.inc
packages/gcc/gcc-package-sdk.inc
packages/gcc/gcc4-build.inc
packages/gcc/gcc_4.0.2.bb
packages/gcc/gcc_4.1.0.bb
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc_4.2.1.bb
Diffs:

#
# mt diff -rbac543c4612d852bbed6209100ed1a521881f0cf -r9d2d4f101ec15557139aebf1b06e02cac699e17d
#
# 
# 
# patch "packages/gcc/gcc-cross_4.1.0.bb"
#  from [916fc24a922221b419d60b6151d0ae0c5be5caa4]
#    to [bf68820e6969c1a4dad95194156ccc2bd43c46f9]
# 
# patch "packages/gcc/gcc-cross_4.1.1.bb"
#  from [1b087988c3814b688c360b580f5b82e04eba58cf]
#    to [0b0ef8454b3e129e9fdbaf711c5a2fb95d696c75]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [36019aa250fcf94fb16c8f3adab162249c9d8053]
#    to [83d6c7ddf9a8d01c94ed440c4e431306ae3dcd81]
# 
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [be2f2c53bbd220132778e60f9e959c8e95466e72]
#    to [e32d37ba80f15300c2db6d0edcc1ede5e4b98c2a]
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [33123161f819b3d5d09d65348d181f6fc9c897a7]
#    to [f115236a51712a96d6f59cc160292498b3579766]
# 
# patch "packages/gcc/gcc-package-sdk.inc"
#  from [371ce0d18607bf95321025378912c51a2bd28f12]
#    to [500f25d0e8d3f040092ef2dda341a183764b280a]
# 
# patch "packages/gcc/gcc4-build.inc"
#  from [724b5fa1e5771686d8f92b83f4a4c6a67fb05d0c]
#    to [37aef6b1b9c21e9d620f2d1624aa43850ad2dfc3]
# 
# patch "packages/gcc/gcc_4.0.2.bb"
#  from [08e1499a8ecdbe234da9108f40268bf6db11bf63]
#    to [974343b9064851c8a4269daa09a344738c7819f2]
# 
# patch "packages/gcc/gcc_4.1.0.bb"
#  from [d7757e27938020db94e7e36ec4fe75df630b01a7]
#    to [c214142e3085b1c1c6c8f256fd775ae8a806e012]
# 
# patch "packages/gcc/gcc_4.1.1.bb"
#  from [ec4016cd35fe9bc8bb774d1827255d6350277cd3]
#    to [8e2e89fd333b81001c31085136fec6cbacb242c7]
# 
# patch "packages/gcc/gcc_4.1.2.bb"
#  from [9898246aa60cafd67aec15702e2857dd9a13c54e]
#    to [e032df06cba0957af0538fbad4e5ccb56586beb3]
# 
# patch "packages/gcc/gcc_4.2.1.bb"
#  from [cf5a7ff85d01add9d5ee5a5f6fc4db5df067224e]
#    to [1db32e8068ef1d5187d2bfb473ca50ab44d60e2b]
# 
============================================================
--- packages/gcc/gcc-cross_4.1.0.bb	916fc24a922221b419d60b6151d0ae0c5be5caa4
+++ packages/gcc/gcc-cross_4.1.0.bb	bf68820e6969c1a4dad95194156ccc2bd43c46f9
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 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++"
============================================================
--- packages/gcc/gcc-cross_4.1.1.bb	1b087988c3814b688c360b580f5b82e04eba58cf
+++ packages/gcc/gcc-cross_4.1.1.bb	0b0ef8454b3e129e9fdbaf711c5a2fb95d696c75
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 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++"
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb	36019aa250fcf94fb16c8f3adab162249c9d8053
+++ packages/gcc/gcc-cross_4.1.2.bb	83d6c7ddf9a8d01c94ed440c4e431306ae3dcd81
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 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++"
============================================================
--- packages/gcc/gcc-cross_4.2.1.bb	be2f2c53bbd220132778e60f9e959c8e95466e72
+++ packages/gcc/gcc-cross_4.2.1.bb	e32d37ba80f15300c2db6d0edcc1ede5e4b98c2a
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 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++"
============================================================
--- packages/gcc/gcc-package-cross.inc	33123161f819b3d5d09d65348d181f6fc9c897a7
+++ packages/gcc/gcc-package-cross.inc	f115236a51712a96d6f59cc160292498b3579766
@@ -1,8 +1,6 @@ INHIBIT_PACKAGE_STRIP ?= ""
 # 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
 }
============================================================
--- packages/gcc/gcc-package-sdk.inc	371ce0d18607bf95321025378912c51a2bd28f12
+++ packages/gcc/gcc-package-sdk.inc	500f25d0e8d3f040092ef2dda341a183764b280a
@@ -1,8 +1,6 @@ INHIBIT_PACKAGE_STRIP ?= ""
 # 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"
 
============================================================
--- packages/gcc/gcc4-build.inc	724b5fa1e5771686d8f92b83f4a4c6a67fb05d0c
+++ packages/gcc/gcc4-build.inc	37aef6b1b9c21e9d620f2d1624aa43850ad2dfc3
@@ -1,6 +1,4 @@ FORTRAN = ",f95"
 FORTRAN = ",f95"
-HAS_GFORTRAN ?= "yes"
-HAS_G2C = "no"
 
 include gcc3-build.inc
 
============================================================
--- packages/gcc/gcc_4.0.2.bb	08e1499a8ecdbe234da9108f40268bf6db11bf63
+++ packages/gcc/gcc_4.0.2.bb	974343b9064851c8a4269daa09a344738c7819f2
@@ -35,5 +35,3 @@ FORTRAN = ""
 EXTRA_OECONF += "--disable-libssp"
 
 FORTRAN = ""
-HAS_GFORTRAN = ""
-HAS_G2C = "no"
============================================================
--- packages/gcc/gcc_4.1.0.bb	d7757e27938020db94e7e36ec4fe75df630b01a7
+++ packages/gcc/gcc_4.1.0.bb	c214142e3085b1c1c6c8f256fd775ae8a806e012
@@ -21,7 +21,5 @@ FORTRAN = ""
 EXTRA_OECONF += "--disable-libssp"
 
 FORTRAN = ""
-HAS_GFORTRAN = ""
-HAS_G2C = "no"
 
 
============================================================
--- packages/gcc/gcc_4.1.1.bb	ec4016cd35fe9bc8bb774d1827255d6350277cd3
+++ packages/gcc/gcc_4.1.1.bb	8e2e89fd333b81001c31085136fec6cbacb242c7
@@ -46,8 +46,6 @@ FORTRAN = ""
 #Set the fortran bits
 # 'fortran' or '', not 'f77' like gcc3 had
 FORTRAN = ""
-HAS_GFORTRAN = "no"
-HAS_G2C = "no"
 
 #Set the java bits
 JAVA_arm = ""
============================================================
--- packages/gcc/gcc_4.1.2.bb	9898246aa60cafd67aec15702e2857dd9a13c54e
+++ packages/gcc/gcc_4.1.2.bb	e032df06cba0957af0538fbad4e5ccb56586beb3
@@ -39,9 +39,6 @@ FORTRAN_linux-gnueabi = ",fortran"
 # ',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 = ""
============================================================
--- packages/gcc/gcc_4.2.1.bb	cf5a7ff85d01add9d5ee5a5f6fc4db5df067224e
+++ packages/gcc/gcc_4.2.1.bb	1db32e8068ef1d5187d2bfb473ca50ab44d60e2b
@@ -64,9 +64,6 @@ FORTRAN_linux-gnueabi = ",fortran"
 # '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 = ""

More information about the Openembedded-commits mailing list