diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2015-02-05 15:06:56 +0000 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-02-05 16:58:37 +0100 |
| commit | 752079011d1d7bdb61230305f94e3f7b9e06d9bd (patch) | |
| tree | e6b5e3146d5e92950b332ceefe172f8578b686e6 | |
| parent | e5efd108d60d1852fc55acc872388dc722f53758 (diff) | |
libvips: requires C++ support
libvips requires C++ support, otherwise it will fail with an error
message like this one:
error: ../libvips/.libs/libvips.so: No such file or directory
The '--disable-cxx' configure option seems to be broken, so in the
meantime a compiler with C++ support is required in order to build
libvips successfully.
Reported upstream:
https://github.com/jcupitt/libvips/issues/231
Fixes:
http://autobuild.buildroot.net/results/cdc7cf5d3501f80c74b70aa09f93b2ad4e2f8602/
http://autobuild.buildroot.net/results/39173dbcbbd0a243900ea583cec024b51f8b803a/
http://autobuild.buildroot.net/results/6794705195bcdb636a8e6582ef5a1e153d4d66b3/
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/libvips/Config.in | 8 | ||||
| -rw-r--r-- | package/libvips/libvips.mk | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/package/libvips/Config.in b/package/libvips/Config.in index 1a0d35c5c..ad7a10371 100644 --- a/package/libvips/Config.in +++ b/package/libvips/Config.in @@ -3,6 +3,9 @@ config BR2_PACKAGE_LIBVIPS depends on BR2_USE_WCHAR # gettext, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # fork() + # C++ support is required to build libvips + # https://github.com/jcupitt/libvips/issues/231 + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE @@ -13,6 +16,7 @@ config BR2_PACKAGE_LIBVIPS http://www.vips.ecs.soton.ac.uk/ -comment "libvips needs a toolchain w/ wchar, threads" +comment "libvips needs a toolchain w/ wchar, threads, C++" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 35e7684d3..1efe21a2d 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -33,11 +33,9 @@ LIBVIPS_DEPENDENCIES = \ host-pkgconf libglib2 \ libxml2 $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +# --disable-cxx is broken upstream +# https://github.com/jcupitt/libvips/issues/231 LIBVIPS_CONF_OPTS += --enable-cxx -else -LIBVIPS_CONF_OPTS += --disable-cxx -endif ifeq ($(BR2_PACKAGE_JPEG),y) LIBVIPS_CONF_OPTS += --with-jpeg |