Browse Source

libzip: fix typo in patch (fixes #15992)

This prevented expansion of libdir in pkgconfig.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
lilik-openwrt-22.03
Michael Heimpold 3 years ago
parent
commit
20c884bbd5
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      libs/libzip/Makefile
  2. +1
    -1
      libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch

+ 1
- 1
libs/libzip/Makefile View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libzip
PKG_VERSION:=1.8.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://libzip.org/download/


+ 1
- 1
libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch View File

@ -23,7 +23,7 @@ Addresses #248
+file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR})
+set(bindir "\${prefix}/${pc_relative_bindir}")
+file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR})
+set(libdir "\${prefix)/${pc_relative_libdir}")
+set(libdir "\${prefix}/${pc_relative_libdir}")
+file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+set(includedir "\${prefix}/${pc_relative_includedir}")
if(CMAKE_SYSTEM_NAME MATCHES BSD)


Loading…
Cancel
Save