bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] libgphoto2: disable iconv support if built against the stub, this allows drivers with optional conversion to work which would otherwise fail

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@27714 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-07-20 21:48:49 +00:00
parent c19b4eb1f4
commit d6ded14e05
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/libgphoto2/Makefile
View File

@ -51,14 +51,22 @@ CONFIGURE_ARGS += \
--without-libintl-prefix \ --without-libintl-prefix \
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \ CPPFLAGS="$$$$CPPFLAGS $(ICONV_CFLAGS)" \
LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \ LDFLAGS="$$$$LDFLAGS $(ICONV_LDFLAGS)" \
LIBEXIF_CFLAGS="$$$$CPPFLAGS" \ LIBEXIF_CFLAGS="$$$$CPPFLAGS" \
LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \ LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
LIBUSB_CFLAGS="$$$$CPPFLAGS" \ LIBUSB_CFLAGS="$$$$CPPFLAGS" \
LIBUSB_LIBS="$$$$LDFLAGS -lusb" \ LIBUSB_LIBS="$$$$LDFLAGS -lusb" \
LIBS="-lltdl" \ 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 += \ MAKE_FLAGS += \
LIBLTDL="" \ LIBLTDL="" \