Yi Zhao 9bbf3a7362 rpm: fix expansion of %_libdir in macros ... There is a patch in oe-core[1] to avoid hardcoded paths in macros. It tries to use libdir to expand %_libdir in macros.in. However, in upstream commit[2], libdir for macros in CMakeLists.txt is set to ${prefix}/=LIB=, which causes %_libdir to expand to ${prefix}/=LIB= instead of the correct path in the final macros. On target: $ rpm --showrc | grep _libdir [snip] -13: _libdir ${prefix}/=LIB= [snip] This also causes %__pkgconfig_path in fileattrs/pkgconfig.attr to become an invalid regular expression when building rpm packages. This results a warning in log.do_package_write_rpm in all packages: Warning: Ignoring invalid regular expression ^((${prefix}/=LIB=|usr/share)/pkgconfig/.*.pc|usr/bin/pkg-config)$ Set libdir to ${CMAKE_INSTALL_FULL_LIBDIR} instead of ${prefix}/=LIB= to make sure it is expanded to the correct path in macros. After the patch: On target: $ rpm --showrc | grep _libdir [snip] -13: _libdir /usr/lib [snip] [1] https://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch [2] d2abb7a487 (From OE-Core rev: 7c7f95668d270a825c7d3d235ec2b8d4e7eb0b9f) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit ae0e217145f45d065124aeb0a7d72a0c25f621ef) Signed-off-by: Steve Sakoman <steve@sakoman.com>		2024-10-02 06:15:15 -07:00
..
files	rpm: fix expansion of %_libdir in macros	2024-10-02 06:15:15 -07:00
rpm_4.19.1.1.bb	rpm: fix expansion of %_libdir in macros	2024-10-02 06:15:15 -07:00