From d6ded14e0560f8677cd75d93b062407abcf234e6 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 20 Jul 2011 21:48:49 +0000 Subject: [PATCH] [packages] libgphoto2: disable iconv support if built against the stub, this allows drivers with optional conversion to work which would otherwise fail git-svn-id: svn://svn.openwrt.org/openwrt/packages@27714 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/libgphoto2/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile index 897c1e34c..0b4a8579e 100644 --- a/libs/libgphoto2/Makefile +++ b/libs/libgphoto2/Makefile @@ -51,14 +51,22 @@ CONFIGURE_ARGS += \ --without-libintl-prefix \ CONFIGURE_VARS += \ - CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \ - LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \ + CPPFLAGS="$$$$CPPFLAGS $(ICONV_CFLAGS)" \ + LDFLAGS="$$$$LDFLAGS $(ICONV_LDFLAGS)" \ LIBEXIF_CFLAGS="$$$$CPPFLAGS" \ LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \ LIBUSB_CFLAGS="$$$$CPPFLAGS" \ LIBUSB_LIBS="$$$$LDFLAGS -lusb" \ LIBS="-lltdl" \ +# If OpenWrt is using the iconv stub, we disable iconv support +# in libgphoto2 entirely since the stub lacks some essential +# conversions like UCS-2 to UTF-8 which will let certain drivers +# fail with "Failed to create iconv converter" . +ifneq ($(ICONV_FULL),1) + CONFIGURE_VARS += am_cv_func_iconv=no am_cv_lib_iconv=no +endif + MAKE_FLAGS += \ LIBLTDL="" \ -- 2.11.0