From 2f5a79cdc278603bb972ccbdf78224d812a658ed Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 3 May 2019 01:17:12 +0800 Subject: [PATCH] xz: Use relative paths in pkg-config metadata file By default, the liblzma pkg-config file (liblzma.pc) is generated with absolute paths, which $(STAGING_DIR_HOST)/bin/pkg-config is unable to override. This patches the file to use paths relative to ${prefix} and ${exec_prefix}. Signed-off-by: Jeffery To --- utils/xz/Makefile | 2 +- .../xz/patches/001-relative-pkg-config-paths.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 utils/xz/patches/001-relative-pkg-config-paths.patch diff --git a/utils/xz/Makefile b/utils/xz/Makefile index 7b80883540..0b94e5bdd8 100644 --- a/utils/xz/Makefile +++ b/utils/xz/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xz PKG_VERSION:=5.2.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/lzmautils diff --git a/utils/xz/patches/001-relative-pkg-config-paths.patch b/utils/xz/patches/001-relative-pkg-config-paths.patch new file mode 100644 index 0000000000..b89c13f75f --- /dev/null +++ b/utils/xz/patches/001-relative-pkg-config-paths.patch @@ -0,0 +1,13 @@ +--- a/src/liblzma/liblzma.pc.in ++++ b/src/liblzma/liblzma.pc.in +@@ -7,8 +7,8 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include + + Name: liblzma + Description: General purpose data compression library