diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/luarocks/cfg.lua | 17 | ||||
-rw-r--r-- | src/luarocks/deps.lua | 36 | ||||
-rw-r--r-- | src/luarocks/fs/unix.lua | 8 |
3 files changed, 52 insertions, 9 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 8e26bb46..9227db4b 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
@@ -437,6 +437,23 @@ if detected.solaris then | |||
437 | defaults.variables.MAKE = "gmake" | 437 | defaults.variables.MAKE = "gmake" |
438 | end | 438 | end |
439 | 439 | ||
440 | if type(site_config.LUAROCKS_ADD_LIB_SUBDIRS) == "table" and next(site_config.LUAROCKS_ADD_LIB_SUBDIRS) ~= nil then | ||
441 | local lib = defaults.external_deps_subdirs.lib | ||
442 | if type(lib) ~= "table" then | ||
443 | lib = { lib } | ||
444 | end | ||
445 | local rt_lib = defaults.runtime_external_deps_subdirs.lib | ||
446 | if type(rt_lib) ~= "table" then | ||
447 | rt_lib = { rt_lib } | ||
448 | end | ||
449 | for i,v in ipairs(site_config.LUAROCKS_ADD_LIB_SUBDIRS) do | ||
450 | lib[#lib+1] = v | ||
451 | rt_lib[#rt_lib+1] = v | ||
452 | end | ||
453 | defaults.external_deps_subdirs.lib = lib | ||
454 | defaults.runtime_external_deps_subdirs.lib = rt_lib | ||
455 | end | ||
456 | |||
440 | -- Expose some more values detected by LuaRocks for use by rockspec authors. | 457 | -- Expose some more values detected by LuaRocks for use by rockspec authors. |
441 | defaults.variables.LIB_EXTENSION = defaults.lib_extension | 458 | defaults.variables.LIB_EXTENSION = defaults.lib_extension |
442 | defaults.variables.OBJ_EXTENSION = defaults.obj_extension | 459 | defaults.variables.OBJ_EXTENSION = defaults.obj_extension |
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index f24dc507..7f3b44f2 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
@@ -583,7 +583,19 @@ function check_external_deps(rockspec, mode) | |||
583 | prefix = prefix.prefix | 583 | prefix = prefix.prefix |
584 | end | 584 | end |
585 | for dirname, dirdata in pairs(dirs) do | 585 | for dirname, dirdata in pairs(dirs) do |
586 | dirdata.dir = vars[name.."_"..dirname] or dir.path(prefix, dirdata.subdir) | 586 | local paths |
587 | local path_var_value = vars[name.."_"..dirname] | ||
588 | if path_var_value then | ||
589 | paths = { path_var_value } | ||
590 | elseif type(dirdata.subdir) == "table" then | ||
591 | paths = {} | ||
592 | for i,v in ipairs(dirdata.subdir) do | ||
593 | paths[i] = dir.path(prefix, v) | ||
594 | end | ||
595 | else | ||
596 | paths = { dir.path(prefix, dirdata.subdir) } | ||
597 | end | ||
598 | dirdata.dir = paths[1] | ||
587 | local file = files[dirdata.testfile] | 599 | local file = files[dirdata.testfile] |
588 | if file then | 600 | if file then |
589 | local files = {} | 601 | local files = {} |
@@ -605,16 +617,22 @@ function check_external_deps(rockspec, mode) | |||
605 | if f:match("%.so$") or f:match("%.dylib$") or f:match("%.dll$") then | 617 | if f:match("%.so$") or f:match("%.dylib$") or f:match("%.dll$") then |
606 | f = f:gsub("%.[^.]+$", "."..cfg.external_lib_extension) | 618 | f = f:gsub("%.[^.]+$", "."..cfg.external_lib_extension) |
607 | end | 619 | end |
608 | if f:match("%*") then | 620 | for _, d in ipairs(paths) do |
609 | local replaced = f:gsub("%.", "%%."):gsub("%*", ".*") | 621 | if f:match("%*") then |
610 | for _, entry in ipairs(fs.list_dir(dirdata.dir)) do | 622 | local replaced = f:gsub("%.", "%%."):gsub("%*", ".*") |
611 | if entry:match(replaced) then | 623 | for _, entry in ipairs(fs.list_dir(d)) do |
612 | found = true | 624 | if entry:match(replaced) then |
613 | break | 625 | found = true |
626 | break | ||
627 | end | ||
614 | end | 628 | end |
629 | else | ||
630 | found = fs.is_file(dir.path(d, f)) | ||
631 | end | ||
632 | if found then | ||
633 | dirdata.dir = d | ||
634 | break | ||
615 | end | 635 | end |
616 | else | ||
617 | found = fs.is_file(dir.path(dirdata.dir, f)) | ||
618 | end | 636 | end |
619 | if found then | 637 | if found then |
620 | break | 638 | break |
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua index cccbbd33..cb5e634d 100644 --- a/src/luarocks/fs/unix.lua +++ b/src/luarocks/fs/unix.lua | |||
@@ -61,6 +61,14 @@ function wrap_script(file, dest, name, version) | |||
61 | wrapper:write('LUA_PATH="'..package.path..';$LUA_PATH"\n') | 61 | wrapper:write('LUA_PATH="'..package.path..';$LUA_PATH"\n') |
62 | wrapper:write('LUA_CPATH="'..package.cpath..';$LUA_CPATH"\n') | 62 | wrapper:write('LUA_CPATH="'..package.cpath..';$LUA_CPATH"\n') |
63 | wrapper:write('export LUA_PATH LUA_CPATH\n') | 63 | wrapper:write('export LUA_PATH LUA_CPATH\n') |
64 | wrapper:write('if [ -n "$LUA_PATH_5_2" ]; then\n') | ||
65 | wrapper:write(' LUA_PATH_5_2="'..package.path..';$LUA_PATH_5_2"\n') | ||
66 | wrapper:write(' export LUA_PATH_5_2\n') | ||
67 | wrapper:write('fi\n') | ||
68 | wrapper:write('if [ -n "$LUA_CPATH_5_2" ]; then\n') | ||
69 | wrapper:write(' LUA_CPATH_5_2="'..package.cpath..';$LUA_CPATH_5_2"\n') | ||
70 | wrapper:write(' export LUA_CPATH_5_2\n') | ||
71 | wrapper:write('fi\n') | ||
64 | wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" "$@"\n') | 72 | wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" "$@"\n') |
65 | wrapper:close() | 73 | wrapper:close() |
66 | if fs.chmod(wrapname, "0755") then | 74 | if fs.chmod(wrapname, "0755") then |