diff options
| author | ruki <[email protected]> | 2023-08-02 22:41:32 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-08-02 22:41:32 +0800 |
| commit | 0ffb589fb816c4d886cf88d322df45f7ebe5434e (patch) | |
| tree | fa1790db80813ebcde04fe7551feaa14d1238bab | |
| parent | a27745121cc4ce14d3c4523086a0cb5a4f1a86a8 (diff) | |
fix aclocal path
| -rw-r--r-- | xmake/modules/package/tools/autoconf.lua | 6 | ||||
| -rw-r--r-- | xmake/modules/package/tools/make.lua | 3 | ||||
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 3 | ||||
| -rw-r--r-- | xmake/modules/package/tools/scons.lua | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index 258a31bd3..1512173dd 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -371,6 +371,9 @@ function buildenvs(package, opt) if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) end + end + -- some binary packages contain it too. e.g. libtool + for _, dep in ipairs(package:orderdeps()) do local aclocal = path.join(dep:installdir(), "share", "aclocal") if os.isdir(aclocal) then table.insert(ACLOCAL_PATH, aclocal) @@ -396,6 +399,9 @@ function autogen_envs(package, opt) if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) end + end + -- some binary packages contain it too. e.g. libtool + for _, dep in ipairs(package:orderdeps()) do local aclocal = path.join(dep:installdir(), "share", "aclocal") if os.isdir(aclocal) then table.insert(ACLOCAL_PATH, aclocal) diff --git a/xmake/modules/package/tools/make.lua b/xmake/modules/package/tools/make.lua index 694a3a824..283f3d290 100644 --- a/xmake/modules/package/tools/make.lua +++ b/xmake/modules/package/tools/make.lua @@ -78,6 +78,9 @@ function buildenvs(package) if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) end + end + -- some binary packages contain it too. e.g. libtool + for _, dep in ipairs(package:orderdeps()) do local aclocal = path.join(dep:installdir(), "share", "aclocal") if os.isdir(aclocal) then table.insert(ACLOCAL_PATH, aclocal) diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index c4057ee32..276b63346 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -405,6 +405,9 @@ function buildenvs(package, opt) if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) end + end + -- some binary packages contain it too. e.g. libtool + for _, dep in ipairs(package:orderdeps()) do local aclocal = path.join(dep:installdir(), "share", "aclocal") if os.isdir(aclocal) then table.insert(ACLOCAL_PATH, aclocal) diff --git a/xmake/modules/package/tools/scons.lua b/xmake/modules/package/tools/scons.lua index 65b73dfec..1b59db92e 100644 --- a/xmake/modules/package/tools/scons.lua +++ b/xmake/modules/package/tools/scons.lua @@ -84,6 +84,9 @@ function buildenvs(package, opt) if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) end + end + -- some binary packages contain it too. e.g. libtool + for _, dep in ipairs(package:orderdeps()) do local aclocal = path.join(dep:installdir(), "share", "aclocal") if os.isdir(aclocal) then table.insert(ACLOCAL_PATH, aclocal) |