diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-06 17:16:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-08 00:09:42 +0100 |
commit | 87d4b74f0e69aa13c6f7d54c51e7136e58696a60 (patch) | |
tree | 9645c010b96d37ee1db3b7e7b568c3d1250a7ff2 | |
parent | b5382b421837adacf2028b9fac97e79e132dc438 (diff) | |
download | poky-87d4b74f0e69aa13c6f7d54c51e7136e58696a60.tar.gz |
lua: Fix multilib buildpath reproducibility issues
The .pc we install ourselves for lua has hardcoded /lib assumptions in it
which means in a multilib environment, full build paths end up in users
like rpm's configuration.
Fix the .pc file to use a correct includedir and libdir to resolve
those reproducibility issues.
(From OE-Core rev: 93bee5c74b8d181adf93de4b4101e25d24780603)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/lua/lua/lua.pc.in | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/lua/lua_5.4.4.bb | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-devtools/lua/lua/lua.pc.in b/meta/recipes-devtools/lua/lua/lua.pc.in index c27e86e85d..1fc288c4fe 100644 --- a/meta/recipes-devtools/lua/lua/lua.pc.in +++ b/meta/recipes-devtools/lua/lua/lua.pc.in | |||
@@ -1,6 +1,5 @@ | |||
1 | prefix=/usr | 1 | libdir=@LIBDIR@ |
2 | libdir=${prefix}/lib | 2 | includedir=@INCLUDEDIR@ |
3 | includedir=${prefix}/include | ||
4 | 3 | ||
5 | Name: Lua | 4 | Name: Lua |
6 | Description: Lua language engine | 5 | Description: Lua language engine |
diff --git a/meta/recipes-devtools/lua/lua_5.4.4.bb b/meta/recipes-devtools/lua/lua_5.4.4.bb index d704841378..6f2cea5314 100644 --- a/meta/recipes-devtools/lua/lua_5.4.4.bb +++ b/meta/recipes-devtools/lua/lua_5.4.4.bb | |||
@@ -45,7 +45,7 @@ do_install () { | |||
45 | install | 45 | install |
46 | install -d ${D}${libdir}/pkgconfig | 46 | install -d ${D}${libdir}/pkgconfig |
47 | 47 | ||
48 | sed -e s/@VERSION@/${PV}/ ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc | 48 | sed -e s/@VERSION@/${PV}/ -e s#@LIBDIR@#${libdir}# -e s#@INCLUDEDIR@#${includedir}# ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc |
49 | install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ | 49 | install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ |
50 | rmdir ${D}${datadir}/lua/5.4 | 50 | rmdir ${D}${datadir}/lua/5.4 |
51 | rmdir ${D}${datadir}/lua | 51 | rmdir ${D}${datadir}/lua |