From 782eda9750e5f0d2bda103e1fbe5154032e85822 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 15 May 2019 22:30:24 +0800 Subject: zlib: Use relative paths in pkg-config metadata file The buildroot pkg-config (in staging_dir/host/bin) overrides the prefix and exec_prefix variables in *.pc files, to supply the correct (buildroot) paths for callers. If other variables are not defined relative to prefix and exec_prefix, then the returned values will be incorrect. The default zlib.pc file generated by cmake contains absolute paths. This patches the file to use relative paths (relative to ${prefix} and ${exec_prefix}). Signed-off-by: Jeffery To --- .../libs/zlib/patches/004-relative-pkg-config-paths.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 package/libs/zlib/patches/004-relative-pkg-config-paths.patch (limited to 'package/libs/zlib/patches/004-relative-pkg-config-paths.patch') diff --git a/package/libs/zlib/patches/004-relative-pkg-config-paths.patch b/package/libs/zlib/patches/004-relative-pkg-config-paths.patch new file mode 100644 index 0000000000..c86d19b412 --- /dev/null +++ b/package/libs/zlib/patches/004-relative-pkg-config-paths.patch @@ -0,0 +1,14 @@ +--- a/zlib.pc.cmakein ++++ b/zlib.pc.cmakein +@@ -1,8 +1,8 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@INSTALL_LIB_DIR@ +-sharedlibdir=@INSTALL_LIB_DIR@ +-includedir=@INSTALL_INC_DIR@ ++libdir=${exec_prefix}/lib ++sharedlibdir=${exec_prefix}/lib ++includedir=${prefix}/include + + Name: zlib + Description: zlib compression library -- cgit v1.2.3