diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-05-24 17:01:54 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-05-24 17:07:57 +0200 |
| commit | dcd68100c23f980a7bbd1d7d9567a315ee584bdf (patch) | |
| tree | 7257251aa42ab8dec9daaa88fa8726e57ef94f2f | |
| parent | e39414ed07e03c8cd1aecd1874acf40d6d8a8d93 (diff) | |
| download | upstream-dcd68100c23f980a7bbd1d7d9567a315ee584bdf.tar.gz upstream-dcd68100c23f980a7bbd1d7d9567a315ee584bdf.tar.bz2 upstream-dcd68100c23f980a7bbd1d7d9567a315ee584bdf.zip | |
tools: zlib: do not hardcode the install prefix in zlib.pc
Our pkg-config wrapper relies on the ability to redefine the $prefix and
$exec_prefix variables in order to construct proper search paths relative
to the build environment.
Patch the .pc file template to construct libdir, sharedlibdir and includedir
relative to the ${prefix} variable so that it can be overridden as needed.
This also fixes the libxml2/host build issue raised at
https://github.com/openwrt/packages/issues/6073 - it was caused by libxml2's
configure picking up a wrong host search path through zlib.pc, letting it
include the wrong endian.h, causing spurious member redeclaration errors in
system headers.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4da832e201da2493b66024f234a78a2249af4aff)
| -rw-r--r-- | tools/zlib/patches/900-overridable-pc-exec-prefix.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/zlib/patches/900-overridable-pc-exec-prefix.patch b/tools/zlib/patches/900-overridable-pc-exec-prefix.patch new file mode 100644 index 0000000000..4f1e376c90 --- /dev/null +++ b/tools/zlib/patches/900-overridable-pc-exec-prefix.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=${prefix}/lib ++sharedlibdir=${prefix}/lib ++includedir=${prefix}/include + + Name: zlib + Description: zlib compression library |