diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2021-07-02 23:55:45 +0200 |
|---|---|---|
| committer | Michael Heimpold <mhei@heimpold.de> | 2021-07-02 23:59:53 +0200 |
| commit | 20c884bbd5edc95579b950cc59d377e6dab14253 (patch) | |
| tree | 5addfa85578155392cde93cbb6e4d5da85f0db8d /libs/libzip | |
| parent | 57a23bfde38c1d947d01b8a5ca8fb6ff58869fe0 (diff) | |
libzip: fix typo in patch (fixes #15992)
This prevented expansion of libdir in pkgconfig.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Diffstat (limited to 'libs/libzip')
| -rw-r--r-- | libs/libzip/Makefile | 2 | ||||
| -rw-r--r-- | libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index 15c39548e..6d3f04a20 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -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/ diff --git a/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch b/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch index b6d69020b..e49b6ab82 100644 --- a/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch +++ b/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch @@ -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) |