[oe-issues] [Bug 1485] New: Fix for python errors in icecc.bbclass.

[bugzilla-daemon at tinman.treke.net]

http://bugs.openembedded.org/show_bug.cgi?id=1485

           Summary: Fix for python errors in icecc.bbclass.
           Product: Openembedded
           Version: unspecified
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: Build
        AssignedTo: openembedded-issues at lists.openembedded.org
        ReportedBy: likewise at gmx.net
         QAContact: tinderbox-oe at gmx.net


#
# old_revision [01258feaf6b6bd7e383e43692fd47a44c7c97738]
#
# patch "classes/icecc.bbclass"
#  from [992ed9f6ddbcc5cc42dc6f8c8cde0cf217c554a8]
#    to [a69f960b46d1bdc5e9877fa48b93438503972180]
#
============================================================
--- classes/icecc.bbclass       992ed9f6ddbcc5cc42dc6f8c8cde0cf217c554a8
+++ classes/icecc.bbclass       a69f960b46d1bdc5e9877fa48b93438503972180
@@ -1,8 +1,9 @@
 # IceCream distributed compiling support
 #
 # We need to create a tar.bz2 of our toolchain and set
 # ICECC_VERSION, ICECC_CXX and ICEC_CC
 #
+# This class needs ICECC_PATH to be set already.

 def icc_determine_gcc_version(gcc):
     """
@@ -10,6 +11,7 @@ def icc_determine_gcc_version(gcc):

     'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build
5363)'
     """
+    import os
     return os.popen("%s --version" % gcc ).readline().split()[2]

 def create_env(bb,d):
@@ -79,9 +81,9 @@ def create_env(bb,d):
             os.path.join("usr","bin","as") )

     # Now let us find cc1 and cc1plus
-    cc1 = os.popen("%s -print-prog-name=cc1" % data.getVar('CC', d,
True)).read()[:-1]
-    cc1plus = os.popen("%s -print-prog-name=cc1plus" % data.getVar('CC', d,
True)).read()[:-1]
-    spec = os.popen("%s -print-file-name=specs" % data.getVar('CC', d,
True)).read()[:-1]
+    cc1 = os.popen("%s -print-prog-name=cc1" % bb.data.getVar('CC', d,
True)).read()[:-1]
+    cc1plus = os.popen("%s -print-prog-name=cc1plus" % bb.data.getVar('CC', d,
True)).read()[:-1]
+    spec = os.popen("%s -print-file-name=specs" % bb.data.getVar('CC', d,
True)).read()[:-1]

     # CC1 and CC1PLUS should be there...
     tar.add(cc1, os.path.join('usr', 'bin', 'cc1'))
@@ -110,7 +112,6 @@ def create_path(compilers, type, bb, d):
     except:
         os.makedirs(staging)

-
     for compiler in compilers:
         gcc_path = os.path.join(staging, compiler)
         try:
@@ -120,14 +121,12 @@ def create_path(compilers, type, bb, d):

     return staging + ":"

-
 def use_icc_version(bb,d):
     # Constin native native
     prefix = bb.data.expand('${HOST_PREFIX}', d)
     if len(prefix) == 0:
         return "no"

-
     blacklist = [ "cross", "native" ]

     for black in blacklist:
@@ -150,15 +149,13 @@ def icc_path(bb,d,compile):

     prefix = bb.data.expand('${HOST_PREFIX}', d)
     if compile and len(prefix) != 0:
-        return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d )
+        return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d)
     elif not compile or len(prefix) == 0:
         return create_path( ["gcc", "g++"], "native", bb, d)

-
 def icc_version(bb,d):
     return create_env(bb,d)

-
 #
 # set the IceCream  environment variables
 do_configure_prepend() {


-- 
Configure bugmail: http://bugs.openembedded.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.