Skip to contentSkip to conversation

sanity.bbclass: Check for the known broken version of make

PATCH Superseded Mark Hatle 1 participant 2 messages Jun 18, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

PATCH 1/1 sanity.bbclass: Check for the known broken version of make

See GNU Savannah bug 30612 -- make 3.82 is known to be broken.

A number of vendors are providing a modified version, so checking for just the version string is not enough. We also need to check if the patch for the issue has been applied. We use a modified version of the reproduced to check for the issue.

---
 meta/classes/sanity.bbclass | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
meta/classes/sanity.bbclass +39 -0
index 3b9934b..b7f3673 100644
@@ -336,6 +336,41 @@ def check_gcc_march(sanity_data):
 
     return result
 
+# Unpatched version of make 3.82 are known to be broken.  See GNU Savannah Bug 30612.
+# Use the reproducer from http://savannah.gnu.org/bugs/?30612
+def check_make_version(sanity_data, loosever):
+    status, result = oe.utils.getstatusoutput("make --version")
+    if status != 0:
+        return "Unable to execute make --version, exit code %s\n" % status
+    version = result.split()[3]
+    if not (loosever(version) < loosever("3.82") and loosever(version) > loosever("3.82")):
+        # Construct a test file
+        f = open("makefile_test", "w")
+        f.write("makefile_test.a: makefile_test_a.c makefile_test_b.c makefile_test.a( makefile_test_a.c makefile_test_b.c)\n")
+        f.write("\n")
+        f.write("makefile_test_a.c:\n")
+        f.write("	touch $@\n")
+        f.write("\n")
+        f.write("makefile_test_b.c:\n")
+        f.write("	touch $@\n")
+        f.close()
+
+        # Check if make 3.82 has been patched
+        status,result = oe.utils.getstatusoutput("make -f makefile_test")
+
+        os.remove("makefile_test")
+        if os.path.exists("makefile_test_a.c"):
+            os.remove("makefile_test_a.c")
+        if os.path.exists("makefile_test_b.c"):
+            os.remove("makefile_test_b.c")
+        if os.path.exists("makefile_test_a"):
+            os.remove("makefile_test.a")
+
+        if status != 0:
+            return "Your version of make 3.82 is broken. Please revert to 3.81 or install a patched version.\n"
+    return None
+
+
 # Tar version 1.24 and onwards handle overwriting symlinks correctly
 # but earlier versions do not; this needs to work properly for sstate
 def check_tar_version(sanity_data, loosever):
@@ -407,6 +442,10 @@ def check_sanity(sanity_data):
         messages = messages + 'Please set a MACHINE in your local.conf or environment\n'
         machinevalid = False
 
+    makemsg = check_make_version(sanity_data, LooseVersion)
+    if makemsg:
+        messages = messages + makemsg
+
     tarmsg = check_tar_version(sanity_data, LooseVersion)
     if tarmsg:
         messages = messages + tarmsg
Signature · 1 line
1.8.3.1
author
#1 lore raw
Quoted 6 lines · Mark Hatle

See GNU Savannah bug 30612 -- make 3.82 is known to be broken.

A number of vendors are providing a modified version, so checking for just the version string is not enough. We also need to check if the patch for the issue has been applied. We use a modified version of the reproduced to check for the issue.

This was meant to go out as an RFC. The patch still hasn't been fully verified.

Please don't merge it, but feedback would be appreciated!

--Mark

Quoted 63 lines
---
  meta/classes/sanity.bbclass | 39 +++++++++++++++++++++++++++++++++++++++
  1 file changed, 39 insertions(+)
meta/classes/sanity.bbclass +39 -0
index 3b9934b..b7f3673 100644
@@ -336,6 +336,41 @@ def check_gcc_march(sanity_data):
 
      return result
 
+# Unpatched version of make 3.82 are known to be broken.  See GNU Savannah Bug 30612.
+# Use the reproducer from http://savannah.gnu.org/bugs/?30612
+def check_make_version(sanity_data, loosever):
+    status, result = oe.utils.getstatusoutput("make --version")
+    if status != 0:
+        return "Unable to execute make --version, exit code %s\n" % status
+    version = result.split()[3]
+    if not (loosever(version) < loosever("3.82") and loosever(version) > loosever("3.82")):
+        # Construct a test file
+        f = open("makefile_test", "w")
+        f.write("makefile_test.a: makefile_test_a.c makefile_test_b.c makefile_test.a( makefile_test_a.c makefile_test_b.c)\n")
+        f.write("\n")
+        f.write("makefile_test_a.c:\n")
+        f.write("	touch $@\n")
+        f.write("\n")
+        f.write("makefile_test_b.c:\n")
+        f.write("	touch $@\n")
+        f.close()
+
+        # Check if make 3.82 has been patched
+        status,result = oe.utils.getstatusoutput("make -f makefile_test")
+
+        os.remove("makefile_test")
+        if os.path.exists("makefile_test_a.c"):
+            os.remove("makefile_test_a.c")
+        if os.path.exists("makefile_test_b.c"):
+            os.remove("makefile_test_b.c")
+        if os.path.exists("makefile_test_a"):
+            os.remove("makefile_test.a")
+
+        if status != 0:
+            return "Your version of make 3.82 is broken. Please revert to 3.81 or install a patched version.\n"
+    return None
+
+
  # Tar version 1.24 and onwards handle overwriting symlinks correctly
  # but earlier versions do not; this needs to work properly for sstate
  def check_tar_version(sanity_data, loosever):
@@ -407,6 +442,10 @@ def check_sanity(sanity_data):
          messages = messages + 'Please set a MACHINE in your local.conf or environment\n'
          machinevalid = False
 
+    makemsg = check_make_version(sanity_data, LooseVersion)
+    if makemsg:
+        messages = messages + makemsg
+
      tarmsg = check_tar_version(sanity_data, LooseVersion)
      if tarmsg:
          messages = messages + tarmsg