diff options
| author | Peter Seiderer <ps.report@gmx.net> | 2016-11-11 23:54:11 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-11-13 14:29:57 +0100 |
| commit | 6378194f3abaf540e149c22e18e202dd724af835 (patch) | |
| tree | 075a911c6e92ebe0b11f17862105e974489c08cd /package/openjpeg | |
| parent | 70030101e16d79683051ac04e206dc0cfba48f2a (diff) | |
| download | buildroot-6378194f3abaf540e149c22e18e202dd724af835.tar.gz buildroot-6378194f3abaf540e149c22e18e202dd724af835.zip | |
openjpeg: fix static linking of liblcms2
Fixes [1]:
.../host/usr/bfin-buildroot-uclinux-uclibc/sysroot/usr/lib/liblcms2.a(cmsplugin.o): In function `_cmsDeleteContext':
cmsplugin.c:(.text+0x1c2): undefined reference to `_pthread_mutex_lock'
cmsplugin.c:(.text+0x1f6): undefined reference to `_pthread_mutex_unlock'
http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/openjpeg')
| -rw-r--r-- | package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch b/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch new file mode 100644 index 0000000000..4366c0af88 --- /dev/null +++ b/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch @@ -0,0 +1,47 @@ +From 226daa77ea5a35da306f9af2548f3e2c9e79f577 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Fri, 11 Nov 2016 23:35:13 +0100 +Subject: [PATCH] thirdparty: lcms2: append flags found by pkg-config if + available + +This change allows to get all required CFLAGS/LDFLAGS in case of static only +build. + +Fixes a buildroot build failure (see [1]). + +[1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57 + +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + thirdparty/CMakeLists.txt | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index 225f51d..42770ad 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -113,12 +113,19 @@ IF( BUILD_THIRDPARTY) + SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) + ELSE (BUILD_THIRDPARTY) + FIND_PACKAGE(LCMS2) ++ # Static only build: ++ # it is necessary to invoke pkg_check_module on lcms2 since it may have ++ # several other dependencies not declared by its cmake module, but they are ++ # in the its pkgconfig module. ++ IF(PKG_CONFIG_FOUND) ++ pkg_check_modules(PC_LCMS2 QUIET lcms2) ++ ENDIF(PKG_CONFIG_FOUND) + IF(LCMS2_FOUND) + message(STATUS "Your system seems to have a LCMS2 lib available, we will use it") + SET(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE) + SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) +- SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE) +- SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE) ++ SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE) ++ SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE) + ELSE (LCMS2_FOUND) # not found lcms2 + # try to find LCMS + FIND_PACKAGE(LCMS) +-- +2.8.1 + |
