Changeset 27716


Ignore:
Timestamp:
2011-07-20T23:50:51+02:00 (7 years ago)
Author:
jow
Message:

[packages_10.03.1] merge r27714, r27715

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.1/libs/libgphoto2/Makefile

    r25319 r27716  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=libgphoto2 
    1111PKG_VERSION:=2.4.9 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    5252 
    5353CONFIGURE_VARS += \ 
    54         CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \ 
    55         LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \ 
     54        CPPFLAGS="$$$$CPPFLAGS $(ICONV_CFLAGS)" \ 
     55        LDFLAGS="$$$$LDFLAGS $(ICONV_LDFLAGS)" \ 
    5656        LIBEXIF_CFLAGS="$$$$CPPFLAGS" \ 
    5757        LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \ 
     
    5959        LIBUSB_LIBS="$$$$LDFLAGS -lusb" \ 
    6060        LIBS="-lltdl" \ 
     61 
     62# If OpenWrt is using the iconv stub, we disable iconv support  
     63# in libgphoto2 entirely since the stub lacks some essential 
     64# conversions like UCS-2 to UTF-8 which will let certain drivers 
     65# fail with "Failed to create iconv converter" . 
     66ifneq ($(ICONV_FULL),1) 
     67  CONFIGURE_VARS += am_cv_func_iconv=no am_cv_lib_iconv=no 
     68endif 
    6169 
    6270MAKE_FLAGS += \ 
Note: See TracChangeset for help on using the changeset viewer.