Skip to content

Commit a41dd46

Browse files
committed
fix(pkg): compat.eui-neo stages glibconfig.h from either glib layout
glib 2.88.3 leaves the generated header under lib/glib-2.0/include/, where meson installs it; the 2.80.0 payload carried it beside the public headers. Both are staged and the result is asserted. Measured with a fresh install of compat.eui-neo through tests/examples/eui-neo-tray.
1 parent 8d49868 commit a41dd46

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

‎pkgs/e/compat.eui-neo.lua‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,11 +714,18 @@ local function stage_glib(outdir)
714714
end
715715
os.mkdir(path.join(outdir, "include"))
716716
os.cp(incsrc, path.join(outdir, "include", "glib-2.0"))
717-
-- glibconfig.h is a GENERATED header and lands beside the public ones in
718-
-- this payload rather than under lib/glib-2.0/include/ as an autotools
719-
-- build leaves it. Asserted, because a missing one fails deep inside
717+
-- glibconfig.h is a GENERATED header. The 2.80.0 payload (a Debian
718+
-- extraction) carried it beside the public headers; 2.88.3, built from
719+
-- upstream's release, leaves it where meson installs it, under
720+
-- lib/glib-2.0/include/. Both are staged next to the public headers, and
721+
-- the result is asserted, because a missing one fails deep inside
720722
-- glib/gtypes.h with no mention of glib itself.
721-
if not os.isfile(path.join(outdir, "include", "glib-2.0", "glibconfig.h")) then
723+
local staged = path.join(outdir, "include", "glib-2.0", "glibconfig.h")
724+
if not os.isfile(staged) then
725+
local generated = path.join(glib.path, "lib", "glib-2.0", "include", "glibconfig.h")
726+
if os.isfile(generated) then os.cp(generated, staged) end
727+
end
728+
if not os.isfile(staged) then
722729
log.error("eui-neo: glibconfig.h is not in the staged glib headers")
723730
return false
724731
end

0 commit comments

Comments
 (0)