[meego-commits] 5154: Changes to Trunk/cross-armv7l-gcc-accel

[Anas Nashif]

Hi,
I have made the following changes to cross-armv7l-gcc-accel in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5154:

  submit:   Trunk:Testing/cross-armv7l-gcc-accel(r4) -> Trunk/cross-armv7l-gcc-accel


Message:
    migrate from Testing after handset day1

State:   new          2010-06-30T14:58:11 nashif
Comment: None



changes files:
--------------
--- gcc.changes
+++ gcc.changes
@@ -0,0 +1,3 @@
+* Thu Jun 24 2010 Jan-Simon Möller <jsmoeller at linuxfoundation.org> - 4.4.2
+- Migration path to gcc45 for cross-compiler
+

spec files:
-----------

other changes:
--------------

++++++ baselibs.conf
--- baselibs.conf
+++ baselibs.conf
@@ -9,6 +9,7 @@
   targettype armv5tel provides "cross-arm-gcc-accel"
   targettype armv5tel requires "glibc-x86-arm"
   targettype armv5tel requires "gmp-x86-arm"
+  targettype armv5tel requires "libgcc-x86-arm"
   targettype armv5tel requires "mpfr-x86-arm"
   targettype armv5tel requires "gcc"
   targettype armv5tel requires "gcc-c++"
@@ -23,43 +24,36 @@
   targettype armv5tel -/usr/share/doc
   targettype armv5tel -/usr/share/locale
   targettype armv5tel requires "meego-accelerator"
-
-  targettype armv5tel post " for i in gcc g++ ; do mv /usr/bin/${i} /usr/bin/${i}.orig-arm ; cp <prefix>/usr/bin/${i} /usr/bin/${i} ; done "
-  targettype armv5tel post " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/armv5tel-meego-linux-gnueabi/4.4.2 ; mv ${i} ${i}.orig-arm ; cp /emul/ia32-linux/usr/libexec/gcc/armv5tel-meego-linux-gnueabi/4.4.2/${i} ${i} ; done"
-
-  targettype armv5tel preun " for i in gcc g++ ; do rm /usr/bin/${i} ; mv /usr/bin/${i}.orig-arm /usr/bin/${i} ; done "
-  targettype armv5tel preun " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/armv5tel-meego-linux-gnueabi/4.4.2 ; rm ${i} ; mv ${i}.orig-arm ${i} ; done "
-
-cross-armv6l-gcc-accel
-  targettype x86 block!
-  targettype 32bit block!
-  targettype armv5tel block!
-  targettype armv7l block!
-  targettype armv6l autoreqprov off
-  targettype armv6l provides "cross-arm-gcc-accel"
-  targettype armv6l requires "glibc-x86-arm"
-  targettype armv6l requires "gmp-x86-arm"
-  targettype armv6l requires "mpfr-x86-arm"
-  targettype armv6l requires "gcc"
-  targettype armv6l requires "gcc-c++"
-
-
-  targettype armv6l prefix /emul/ia32-linux
-  targettype armv6l extension -arm
-  targettype armv6l +/
-  targettype armv6l -/usr/lib/debug
-  targettype armv6l -/usr/src/debug
-  targettype armv6l -/usr/share/man
-  targettype armv6l -/usr/share/doc
-  targettype armv6l -/usr/share/locale
-  targettype armv6l requires "meego-accelerator"
-
-  targettype armv6l post " for i in gcc g++ ; do mv /usr/bin/${i} /usr/bin/${i}.orig-arm ; cp <prefix>/usr/bin/${i} /usr/bin/${i} ; done "
-  targettype armv6l post " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/armv6l-meego-linux-gnueabi/4.4.2 ; mv ${i} ${i}.orig-arm ; cp /emul/ia32-linux/usr/libexec/gcc/armv6l-meego-linux-gnueabi/4.4.2/${i} ${i} ; done"
-
-  targettype armv6l preun " for i in gcc g++ ; do rm /usr/bin/${i} ; mv /usr/bin/${i}.orig-arm /usr/bin/${i} ; done "
-  targettype armv6l preun " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/armv6l-meego-linux-gnueabi/4.4.2 ; rm ${i} ; mv ${i}.orig-arm ${i} ; done "
-
+  targettype armv5tel post "#set -x"
+  targettype armv5tel post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f3) "
+  targettype armv5tel post " export GCCVER_NEW=$(LANG=C <prefix>/usr/bin/gcc --version | head -1 | cut -d" " -f3) "
+  targettype armv5tel post " export GCCVER_MAJMIN=$(echo "$GCCVER" | cut -d"." -f1,2) "
+  targettype armv5tel post " export GCCVER_NEW_MAJMIN=$(echo "$GCCVER_NEW" | cut -d"." -f1,2) "
+  targettype armv5tel post " if test -z "$GCCVER" -o -z "$GCCVER_NEW" -o -z "$GCCVER_MAJMIN" -o -z "$GCCVER_NEW_MAJMIN" ; then echo "ERROR: Can't determine all gcc versions! Not using cross-compiler!" ; exit 0 ; fi "
+  targettype armv5tel post " if test "$GCCVER_MAJMIN" != "$GCCVER_NEW_MAJMIN" ; then echo "GCC version differ in major or minor - not using cross-compiler!" ; exit 0 ; fi "
+  targettype armv5tel post " if test "$GCC_VER" != "$GCC_VER_NEW"; then echo "Warning: GCC versions don't match on patch level ($GCCVER vs. $GCCVER_NEW). Continuing anyway." ; exit 0; fi"
+
+  targettype armv5tel post " for bin in gcc g++ ; do "
+  targettype armv5tel post "   binary="/usr/bin/${bin}" "
+  targettype armv5tel post "   if test -e ${binary} -a ! -e ${binary}.orig-arm ; then"
+  targettype armv5tel post "     mv ${binary} ${binary}.orig-arm && cp <prefix>${binary} ${binary}"
+  targettype armv5tel post "   else "
+  targettype armv5tel post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
+  targettype armv5tel post "   fi "
+  targettype armv5tel post " done "
+
+  targettype armv5tel post " for bin in cc1 cc1plus ; do "
+  targettype armv5tel post "   binary="/usr/libexec/gcc/armv5tel-meego-linux-gnueabi/$GCCVER/$bin" "
+  targettype armv5tel post "   if test -e ${binary} -a ! -e ${binary}.orig-arm ; then"
+  targettype armv5tel post "     mv ${binary} ${binary}.orig-arm && cp <prefix>/usr/libexec/gcc/armv5tel-meego-linux-gnueabi/$GCCVER_NEW/${bin} ${binary}"
+  targettype armv5tel post "   else "
+  targettype armv5tel post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
+  targettype armv5tel post "   fi "
+  targettype armv5tel post " done "
+
+  targettype armv5tel preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f3) "
+  targettype armv5tel preun " for i in gcc g++ ; do if test -e /usr/bin/${i}.orig-arm ; then rm /usr/bin/${i} ; mv /usr/bin/${i}.orig-arm /usr/bin/${i}; fi ; done "
+  targettype armv5tel preun " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/armv5tel-meego-linux-gnueabi/$GCCVER ; if test -e ${i}.orig-arm ; then rm ${i} ; mv ${i}.orig-arm ${i} ; fi ; done "
 
 cross-armv7l-gcc-accel
   targettype x86 block!
@@ -70,6 +64,7 @@
   targettype armv7l provides "cross-arm-gcc-accel"
   targettype armv7l requires "glibc-x86-arm"
   targettype armv7l requires "gmp-x86-arm"
+  targettype armv7l requires "libgcc-x86-arm"
   targettype armv7l requires "mpfr-x86-arm"
   targettype armv7l requires "gcc"
   targettype armv7l requires "gcc-c++"
@@ -85,8 +80,34 @@
   targettype armv7l -/usr/share/locale
   targettype armv7l requires "meego-accelerator"
 
-  targettype armv7l post " for i in gcc g++ ; do mv /usr/bin/${i} /usr/bin/${i}.orig-arm ; cp <prefix>/usr/bin/${i} /usr/bin/${i} ; done "
-  targettype armv7l post " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/armv7l-meego-linux-gnueabi/4.4.2 ; mv ${i} ${i}.orig-arm ; cp /emul/ia32-linux/usr/libexec/gcc/armv7l-meego-linux-gnueabi/4.4.2/${i} ${i} ; done"
+  targettype armv7l post "#set -x"
+  targettype armv7l post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f3) "
+  targettype armv7l post " export GCCVER_NEW=$(LANG=C <prefix>/usr/bin/gcc --version | head -1 | cut -d" " -f3) "
+  targettype armv7l post " export GCCVER_MAJMIN=$(echo "$GCCVER" | cut -d"." -f1,2) "
+  targettype armv7l post " export GCCVER_NEW_MAJMIN=$(echo "$GCCVER_NEW" | cut -d"." -f1,2) "
+  targettype armv7l post " if test -z "$GCCVER" -o -z "$GCCVER_NEW" -o -z "$GCCVER_MAJMIN" -o -z "$GCCVER_NEW_MAJMIN" ; then echo "ERROR: Can't determine all gcc versions! Not using cross-compiler!" ; exit 0 ; fi "
+  targettype armv7l post " if test "$GCCVER_MAJMIN" != "$GCCVER_NEW_MAJMIN" ; then echo "GCC version differ in major or minor - not using cross-compiler!" ; exit 0 ; fi "
+  targettype armv7l post " if test "$GCC_VER" != "$GCC_VER_NEW"; then echo "Warning: GCC versions don't match on patch level ($GCCVER vs. $GCCVER_NEW). Continuing anyway." ; exit 0; fi"
+
+  targettype armv7l post " for bin in gcc g++ ; do "
+  targettype armv7l post "   binary="/usr/bin/${bin}" "
+  targettype armv7l post "   if test -e ${binary} -a ! -e ${binary}.orig-arm ; then"
+  targettype armv7l post "     mv ${binary} ${binary}.orig-arm && cp <prefix>${binary} ${binary}"
+  targettype armv7l post "   else "
+  targettype armv7l post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
+  targettype armv7l post "   fi "
+  targettype armv7l post " done "
+
+  targettype armv7l post " for bin in cc1 cc1plus ; do "
+  targettype armv7l post "   binary="/usr/libexec/gcc/armv7l-meego-linux-gnueabi/$GCCVER/$bin" "
+  targettype armv7l post "   if test -e ${binary} -a ! -e ${binary}.orig-arm ; then"
+  targettype armv7l post "     mv ${binary} ${binary}.orig-arm && cp <prefix>/usr/libexec/gcc/armv7l-meego-linux-gnueabi/$GCCVER_NEW/${bin} ${binary}"
+  targettype armv7l post "   else "
+  targettype armv7l post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
+  targettype armv7l post "   fi "
+  targettype armv7l post " done "
+
+  targettype armv7l preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f3) "
+  targettype armv7l preun " for i in gcc g++ ; do if test -e /usr/bin/${i}.orig-arm ; then rm /usr/bin/${i} ; mv /usr/bin/${i}.orig-arm /usr/bin/${i}; fi ; done "
+  targettype armv7l preun " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/armv7l-meego-linux-gnueabi/$GCCVER ; if test -e ${i}.orig-arm ; then rm ${i} ; mv ${i}.orig-arm ${i} ; fi ; done "
 
-  targettype armv7l preun " for i in gcc g++ ; do rm /usr/bin/${i} ; mv /usr/bin/${i}.orig-arm /usr/bin/${i} ; done "
-  targettype armv7l preun " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/armv7l-meego-linux-gnueabi/4.4.2 ; rm ${i} ; mv ${i}.orig-arm ${i} ; done "