Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cross/zlib #5496

Merged
merged 2 commits into from
Nov 19, 2022
Merged

Fix cross/zlib #5496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97f2b5c
cross/zlib: fix pkgconfig file
hgy59 Nov 19, 2022
c649c54
openjpeg: fix build with fixed zlib.pc
hgy59 Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cross/openjpeg/Makefile
View file
Open in desktop
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
View file
Open in desktop
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