5 files changed, 12 insertions, 4 deletions

diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index db6f8bc4..59c530a4 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -82,6 +82,7 @@ function builtin.run(rockspec)
          local ok = execute(variables.LD.." "..variables.LIBFLAG, "-o", library, unpack(extras))
          return ok
       end
+      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
       compile_static_library = function(library, objects, libraries, libdirs, name)
          local ok = execute(variables.AR, "rc", library, unpack(objects))
          if ok then
@@ -89,6 +90,7 @@ function builtin.run(rockspec)
          end
          return ok
       end
+      ]]
       compile_wrapper_binary = function(fullname, name)
          --TODO EXEWRAPPER
          local fullbasename = fullname:gsub("%.lua$", ""):gsub("/", "\\")
@@ -135,10 +137,12 @@ function builtin.run(rockspec)
          end
          return ok
       end
+      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
       compile_static_library = function(library, objects, libraries, libdirs, name)
          local ok = execute(variables.AR, "-out:"..library, unpack(objects))
          return ok
       end
+      ]]
       compile_wrapper_binary = function(fullname, name)
          --TODO EXEWRAPPER
          local fullbasename = fullname:gsub("%.lua$", ""):gsub("/", "\\")
@@ -262,6 +266,7 @@ function builtin.run(rockspec)
          if not ok then
             return nil, "Failed compiling module "..module_name
          end
+         --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
          module_name = name:match("([^.]*)$").."."..util.matchquote(cfg.static_lib_extension)
          if moddir ~= "" then
             module_name = dir.path(moddir, module_name)
@@ -271,6 +276,7 @@ function builtin.run(rockspec)
          if not ok then
             return nil, "Failed compiling static library "..module_name
          end
+         ]]
       end
    end
    for _, mods in ipairs({{ tbl = lua_modules, perms = cfg.perm_read }, { tbl = lib_modules, perms = cfg.perm_exec }}) do
diff --git a/src/luarocks/cmd/install.lua b/src/luarocks/cmd/install.lua
index 82f7d33e..8b4a154b 100644
--- a/src/luarocks/cmd/install.lua
+++ b/src/luarocks/cmd/install.lua
@@ -171,7 +171,7 @@ function install.command(flags, name, version)
          if not ok then util.printerr(err) end
       end
 
-      manif.check_dependencies(nil, deps.get_deps_mode(flags))
+      writer.check_dependencies(nil, deps.get_deps_mode(flags))
       return name, version
    else
       local url, err = search.find_suitable_rock(search.make_query(name:lower(), version))
diff --git a/src/luarocks/cmd/make.lua b/src/luarocks/cmd/make.lua
index 54dff86b..d3d02814 100644
--- a/src/luarocks/cmd/make.lua
+++ b/src/luarocks/cmd/make.lua
@@ -13,7 +13,7 @@ local fetch = require("luarocks.fetch")
 local pack = require("luarocks.pack")
 local remove = require("luarocks.remove")
 local deps = require("luarocks.deps")
-local manif = require("luarocks.manif")
+local writer = require("luarocks.manif.writer")
 
 make.help_summary = "Compile package in current directory using a rockspec."
 make.help_arguments = "[--pack-binary-rock] [<rockspec>]"
@@ -82,7 +82,7 @@ function make.command(flags, rockspec)
          if not ok then util.printerr(err) end
       end
 
-      manif.check_dependencies(nil, deps.get_deps_mode(flags))
+      writer.check_dependencies(nil, deps.get_deps_mode(flags))
       return name, version
    end
 end
diff --git a/src/luarocks/core/path.lua b/src/luarocks/core/path.lua
index ffde2c68..a4eb8b4b 100644
--- a/src/luarocks/core/path.lua
+++ b/src/luarocks/core/path.lua
@@ -53,11 +53,13 @@ function path.path_to_module(file)
       name = file:match("(.*)%."..cfg.lib_extension.."$")
       if name then
          name = name:gsub(dir.separator, ".")
+      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
       else
          name = file:match("(.*)%."..cfg.static_lib_extension.."$")
          if name then
             name = name:gsub(dir.separator, ".")
          end
+      ]]
       end
    end
    if not name then name = file end
diff --git a/src/luarocks/manif/writer.lua b/src/luarocks/manif/writer.lua
index 9d7c7ac3..42b92e17 100644
--- a/src/luarocks/manif/writer.lua
+++ b/src/luarocks/manif/writer.lua
@@ -417,7 +417,7 @@ function writer.check_dependencies(repo, deps_mode)
    assert(type(deps_mode) == "string")
    if deps_mode == "none" then deps_mode = cfg.deps_mode end
 
-   local manifest = manif_core.load_local_manifest(rocks_dir)
+   local manifest = manif.load_local_manifest(rocks_dir)
    if not manifest then
       return
    end