Changeset 15d0046 in mainline for tools/autotool.py

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• tools/autotool.py (modified) (3 diffs)

tools/autotool.py

@@ -355 +355 @@
         check_app([common['OBJDUMP'], "--version"], "GNU Objdump utility", details)
         check_app([common['STRIP'], "--version"], "GNU strip", details)
+
+def check_python():
+        "Check for Python dependencies"
+        
+        try:
+                sys.stderr.write("Checking for PyYAML ... ")
+                import yaml
+        except ImportError:
+                print_error(["PyYAML is missing.",
+                             "",
+                             "Please make sure that it is installed in your",
+                             "system (usually part of PyYAML package)."])
+        
+        sys.stderr.write("ok\n")
 
 def decode_value(value):
@@ -810 +824 @@
                         common['CLANG_TARGET'] = clang_target
                 
+                check_python()
+                
                 # Platform-specific utilities
                 if ((config['BARCH'] == "amd64") or (config['BARCH'] == "ia32") or (config['BARCH'] == "ppc32") or (config['BARCH'] == "sparc64")):
@@ -834 +850 @@
                 sandbox_leave(owd)
         
+        common['AUTOGEN'] = "%s/autogen.py" % os.path.dirname(os.path.abspath(sys.argv[0]))
+
         create_makefile(MAKEFILE, common)
         create_header(HEADER, maps)