add DragonFly BSD support

3 files changed, 15 insertions, 18 deletions

diff --git a/spec/sysdetect_spec.lua b/spec/sysdetect_spec.lua
index 7f9cf1be..6ec6f6b6 100644
--- a/spec/sysdetect_spec.lua
+++ b/spec/sysdetect_spec.lua
@@ -55,6 +55,8 @@ describe("luarocks.core.sysdetect #unix #unit", function()
       ["elf-Haiku-GCC2-ls"] = {"haiku", "x86"},
       ["elf-Haiku-GCC7-WebPositive"] = {"haiku", "x86"},
       ["pe-cygwin-ls.exe"] = {"cygwin", "x86"},
+      ["elf-DragonFly-x86_64-less"] = {"dragonfly", "x86_64"},
+
    }
 
    describe("detect_file", function()
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 6a2518c0..9122c877 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -37,6 +37,7 @@ local platform_order = {
    "netbsd",
    "openbsd",
    "freebsd",
+   "dragonfly",
    "linux",
    "macosx",
    "cygwin",
@@ -151,6 +152,7 @@ end
 local platform_sets = {
    freebsd = { unix = true, bsd = true, freebsd = true },
    openbsd = { unix = true, bsd = true, openbsd = true },
+   dragonfly = { unix = true, bsd = true, dragonfly = true },
    solaris = { unix = true, solaris = true },
    windows = { windows = true, win32 = true },
    cygwin = { unix = true, cygwin = true },
@@ -451,6 +453,9 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
 
    if platforms.bsd then
       defaults.variables.MAKE = "gmake"
+      defaults.gcc_rpath = false
+      defaults.variables.CC = "cc"
+      defaults.variables.LD = defaults.variables.CC
    end
 
    if platforms.macosx then
@@ -492,27 +497,14 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
 
    if platforms.freebsd then
       defaults.arch = "freebsd-"..target_cpu
-      defaults.gcc_rpath = false
-      defaults.variables.CC = "cc"
-      defaults.variables.LD = defaults.variables.CC
-      defaults.variables.LIBFLAG = "-shared"
-   end
-
-   if platforms.openbsd then
+   elseif platforms.dragonfly then
+      defaults.arch = "dragonfly-"..target_cpu
+   elseif platforms.openbsd then
       defaults.arch = "openbsd-"..target_cpu
-      defaults.gcc_rpath = false
-      defaults.variables.CC = "cc"
-      defaults.variables.LD = defaults.variables.CC
-      defaults.variables.LIBFLAG = "-shared"
-   end
-
-   if platforms.netbsd then
+   elseif platforms.netbsd then
       defaults.arch = "netbsd-"..target_cpu
-   end
-
-   if platforms.solaris then
+   elseif platforms.solaris then
       defaults.arch = "solaris-"..target_cpu
-      --defaults.platforms = {"unix", "solaris"}
       defaults.variables.MAKE = "gmake"
    end
 
diff --git a/src/luarocks/core/sysdetect.lua b/src/luarocks/core/sysdetect.lua
index 02b8a492..d999203a 100644
--- a/src/luarocks/core/sysdetect.lua
+++ b/src/luarocks/core/sysdetect.lua
@@ -153,6 +153,9 @@ local function detect_elf_system(fd, hdr, sections)
          return "netbsd"
       elseif sections[".note.openbsd.ident"] then
          return "openbsd"
+      elseif sections[".note.tag"] and
+             sections[".note.tag"].namedata == "DragonFly" then
+         return "dragonfly"
       end
 
       local gnu_version_r = sections[".gnu.version_r"]