gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Better handling of PKG_CONFIG_PATH

Browse Source 
Allow override PKG_CONFIG_PATH via env, making it possible to easily
inject alternative library builds for testing or bisecting. This was
only possible when the premake script didn't override it which it
unconditionally did on macos.

Also don't expose the variable holding the path directly but offer a
function to append to the path instead.

Ref: #8135
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2025-07-05 21:09:52 +02:00
parent ad3f6e3119
commit c2cc762616
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/premake/extern_libs5.lua
+1 -1
View File
@@ -64,7 +64,7 @@ pkgconfig = require "pkgconfig"
-- Configure pkgconfig for MacOSX systems
if os.istarget("macosx") then
pkgconfig.additional_pc_path = libraries_dir .. "pkgconfig/"
pkgconfig.add_pkg_config_path(libraries_dir .. "pkgconfig/")
pkgconfig.static_link_libs = true
end
build/premake/pkgconfig/pkgconfig.lua
+17 -6
View File
@@ -1,7 +1,6 @@
local m = {}
m._VERSION = "1.3.0-dev"
m._VERSION = "1.4.0-dev"
m.additional_pc_path = nil
m.static_link_libs = false
local pkg_config_command = "pkg-config"
@@ -9,6 +8,12 @@ if os.getenv("PKG_CONFIG") then
pkg_config_command = os.getenv("PKG_CONFIG")
end
local pkg_config_path = ""
if os.getenv("PKG_CONFIG_PATH") then
pkg_config_path = os.getenv("PKG_CONFIG_PATH")
end
local function os_capture(cmd)
return io.popen(cmd, 'r'):read('*a'):gsub("\n", " ")
end
@@ -16,8 +21,7 @@ end
local function parse_pkg_config_includes(lib, alternative_cmd, alternative_flags)
local result
if not alternative_cmd then
local pc_path = m.additional_pc_path and "PKG_CONFIG_PATH="..m.additional_pc_path or ""
result = os_capture(pc_path .. " " .. pkg_config_command .. " --cflags " .. lib)
result = os_capture("PKG_CONFIG_PATH=" .. pkg_config_path .. " " .. pkg_config_command .. " --cflags " .. lib)
else
if not alternative_flags then
result = os_capture(alternative_cmd.." --cflags")
@@ -49,6 +53,14 @@ local function parse_pkg_config_includes(lib, alternative_cmd, alternative_flags
return dirs, files, options
end
function m.add_pkg_config_path(path)
if pkg_config_path == "" then
pkg_config_path = path
else
pkg_config_path = pkg_config_path .. ":" .. path
end
end
function m.add_includes(lib, alternative_cmd, alternative_flags)
local dirs, files, options = parse_pkg_config_includes(lib, alternative_cmd, alternative_flags)
@@ -68,9 +80,8 @@ end
function m.add_links(lib, alternative_cmd, alternative_flags)
local result
if not alternative_cmd then
local pc_path = m.additional_pc_path and "PKG_CONFIG_PATH="..m.additional_pc_path or ""
local static = m.static_link_libs and " --static " or ""
result = os_capture(pc_path .. " " .. pkg_config_command .. " --libs " .. static .. lib)
result = os_capture("PKG_CONFIG_PATH=" .. pkg_config_path .. " " .. pkg_config_command .. " --libs " .. static .. lib)
else
if not alternative_flags then
result = os_capture(alternative_cmd.." --libs")