Skip to content

Commit

Permalink
Fix cross/zlib (#5496)
Browse files Browse the repository at this point in the history
* cross/zlib: fix pkgconfig file
- fix generated zlib.pc (wrong prefix caused problems in dependent libraries and binaries)

* openjpeg: fix build with fixed zlib.pc
  • Loading branch information
hgy59 authored Nov 19, 2022
1 parent 76fc769 commit 0c60c7e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 2 additions & 0 deletions cross/openjpeg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@ LICENSE = BSD 2-clause simplified
CMAKE_USE_NINJA = 1
CMAKE_ARGS += -DBUILD_STATIC_LIBS=OFF
CMAKE_ARGS += -DOPENJP2_COMPILE_OPTIONS="-O"
# deactivate build of tools (we use the library only)
CMAKE_ARGS += -DBUILD_CODEC=OFF

include ../../mk/spksrc.cross-cmake.mk
7 changes: 6 additions & 1 deletion cross/zlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ LICENSE = zlib-license

ADDITIONAL_CFLAGS = -Os -fPIC

include ../../mk/spksrc.cross-cc.mk
# fix pkgconfig file
# build with cross-cc creates wrong pkgconfig file (prefix without missing package name)
# build with cross-cmake creates correct pkgconfig file, but default folder is share not lib
CMAKE_ARGS += -DINSTALL_PKGCONFIG_DIR=$(INSTALL_PREFIX)/lib/pkgconfig

include ../../mk/spksrc.cross-cmake.mk

0 comments on commit 0c60c7e

Please sign in to comment.