diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-07-19 13:16:00 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-20 09:20:00 +0200 |
| commit | 74f4939c8f85b4d2055a552661bfd984cd3862fd (patch) | |
| tree | 66a13185355f15330ffaab124b2888b4bad078f4 /recipes | |
| parent | cf8d370464b68cd1ccbb2be9b93833c20ad1cfa4 (diff) | |
mupdf: fix build on systems without all dependencies already installed (use -native stuff)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/mupdf/mupdf_0.6.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/recipes/mupdf/mupdf_0.6.bb b/recipes/mupdf/mupdf_0.6.bb index bcd853419b..21d435c441 100644 --- a/recipes/mupdf/mupdf_0.6.bb +++ b/recipes/mupdf/mupdf_0.6.bb @@ -4,7 +4,7 @@ SECTION = "x11/applications" LICENSE = "GPLv3" PR = "r0" -DEPENDS = "openjpeg jbig2dec jpeg zlib virtual/libx11 libxext freetype" +DEPENDS = "openjpeg-native jbig2dec-native jpeg-native freetype-native libpng-native openjpeg jbig2dec jpeg zlib virtual/libx11 libxext freetype" SRC_URI = "http://mupdf.com/download/source/${PN}-${PV}-source.tar.gz \ file://mupdf_fix_endianness.patch \ @@ -35,10 +35,12 @@ do_compile() { # mupdf uses couple of tools for code generation during build process # so we need to compile them first with host compiler unset CFLAGS LDFLAGS + export PKG_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/pkgconfig oe_runmake build/debug - oe_runmake build/debug/cmapdump LD=${BUILD_CC} CC=${BUILD_CC} - oe_runmake build/debug/fontdump LD=${BUILD_CC} CC=${BUILD_CC} + oe_runmake build/debug/cmapdump LD="${BUILD_CC} -L${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE}" CC=${BUILD_CC} + oe_runmake build/debug/fontdump LD="${BUILD_CC} -L${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE}" CC=${BUILD_CC} + export PKG_CONFIG_PATH=${STAGING_LIBDIR}/pkgconfig # ...and then we fire 'make', feeding proper # cross-compilation flags through Makerules file echo "CFLAGS += ${CFLAGS}" >> ${S}/Makerules |