Skip to content

Commit 0ffb589

Browse files
committed
fix aclocal path
1 parent a277451 commit 0ffb589

File tree

4 files changed

+15
-0
lines changed

4 files changed

+15
-0
lines changed

xmake/modules/package/tools/autoconf.lua

+6
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,9 @@ function buildenvs(package, opt)
371371
if os.isdir(pkgconfig) then
372372
table.insert(PKG_CONFIG_PATH, pkgconfig)
373373
end
374+
end
375+
-- some binary packages contain it too. e.g. libtool
376+
for _, dep in ipairs(package:orderdeps()) do
374377
local aclocal = path.join(dep:installdir(), "share", "aclocal")
375378
if os.isdir(aclocal) then
376379
table.insert(ACLOCAL_PATH, aclocal)
@@ -396,6 +399,9 @@ function autogen_envs(package, opt)
396399
if os.isdir(pkgconfig) then
397400
table.insert(PKG_CONFIG_PATH, pkgconfig)
398401
end
402+
end
403+
-- some binary packages contain it too. e.g. libtool
404+
for _, dep in ipairs(package:orderdeps()) do
399405
local aclocal = path.join(dep:installdir(), "share", "aclocal")
400406
if os.isdir(aclocal) then
401407
table.insert(ACLOCAL_PATH, aclocal)

xmake/modules/package/tools/make.lua

+3
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ function buildenvs(package)
7878
if os.isdir(pkgconfig) then
7979
table.insert(PKG_CONFIG_PATH, pkgconfig)
8080
end
81+
end
82+
-- some binary packages contain it too. e.g. libtool
83+
for _, dep in ipairs(package:orderdeps()) do
8184
local aclocal = path.join(dep:installdir(), "share", "aclocal")
8285
if os.isdir(aclocal) then
8386
table.insert(ACLOCAL_PATH, aclocal)

xmake/modules/package/tools/meson.lua

+3
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,9 @@ function buildenvs(package, opt)
405405
if os.isdir(pkgconfig) then
406406
table.insert(PKG_CONFIG_PATH, pkgconfig)
407407
end
408+
end
409+
-- some binary packages contain it too. e.g. libtool
410+
for _, dep in ipairs(package:orderdeps()) do
408411
local aclocal = path.join(dep:installdir(), "share", "aclocal")
409412
if os.isdir(aclocal) then
410413
table.insert(ACLOCAL_PATH, aclocal)

xmake/modules/package/tools/scons.lua

+3
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ function buildenvs(package, opt)
8484
if os.isdir(pkgconfig) then
8585
table.insert(PKG_CONFIG_PATH, pkgconfig)
8686
end
87+
end
88+
-- some binary packages contain it too. e.g. libtool
89+
for _, dep in ipairs(package:orderdeps()) do
8790
local aclocal = path.join(dep:installdir(), "share", "aclocal")
8891
if os.isdir(aclocal) then
8992
table.insert(ACLOCAL_PATH, aclocal)

0 commit comments

Comments
 (0)