don't use included ltdl lib, standardize
git-svn-id: svn://svn.openwrt.org/openwrt/packages@4897 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -12,12 +12,12 @@ PKG_NAME:=gphoto2
|
||||
PKG_VERSION:=2.2.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=@SF/gphoto
|
||||
PKG_MD5SUM:=f5c1f83185db598b4ca52889964a5e84
|
||||
PKG_CAT:=bzcat
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
@ -25,42 +25,43 @@ include $(INCLUDE_DIR)/package.mk
|
||||
define Package/gphoto2
|
||||
SECTION:=multimedia
|
||||
CATEGORY:=Multimedia
|
||||
DEPENDS:=+libusb +libexif +libpopt +libgphoto2
|
||||
DEPENDS:=+libexif +libgphoto2 +libltdl +libpopt +libpthread
|
||||
TITLE:=Gphoto Digital Camera Control
|
||||
DESCRIPTION:=For downloading and controlling digital cameras
|
||||
URL:=http://www.gphoto.org
|
||||
URL:=http://www.gphoto.org/
|
||||
endef
|
||||
|
||||
BIG_ENDIAN:=no
|
||||
ifeq ($(ARCH),mips)
|
||||
BIG_ENDIAN:=yes
|
||||
BIG_ENDIAN:=yes
|
||||
endif
|
||||
ifeq ($(ARCH),armeb)
|
||||
BIG_ENDIAN:=yes
|
||||
BIG_ENDIAN:=yes
|
||||
endif
|
||||
ifeq ($(ARCH),powerpc)
|
||||
BIG_ENDIAN:=yes
|
||||
BIG_ENDIAN:=yes
|
||||
endif
|
||||
|
||||
define Build/Configure
|
||||
$(call Build/Configure/Default,--without-libiconv-prefix \
|
||||
$(call Build/Configure/Default, \
|
||||
--without-libiconv-prefix \
|
||||
--without-libintl-prefix \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
$(DISABLE_NLS) \
|
||||
--enable-shared \
|
||||
--enable-static,LIBGPHOTO2_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/gphoto2" \
|
||||
LIBGPHOTO2_LIBS="-L$(STAGING_DIR)/usr/lib -lgphoto2_port -lgphoto2" \
|
||||
LIBEXIF_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
|
||||
LIBEXIF_LIBS="-L$(STAGING_DIR)/usr/lib -lexif" \
|
||||
POPT_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
|
||||
POPT_LIBS="-L$(STAGING_DIR)/usr/lib -lpopt" \
|
||||
ac_cv_c_bigendian=$(BIG_ENDIAN) \
|
||||
ac_cv_func_malloc_0_nonnull=yes)
|
||||
, \
|
||||
LIBGPHOTO2_CFLAGS="$$$$CFLAGS -I$(STAGING_DIR)/usr/include/gphoto2 $$$$CPPFLAGS" \
|
||||
LIBGPHOTO2_LIBS="$$$$LDFLAGS -lgphoto2 -lgphoto2_port -lltdl" \
|
||||
LIBEXIF_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
|
||||
LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
|
||||
POPT_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
|
||||
POPT_LIBS="$$$$LDFLAGS -lpopt" \
|
||||
ac_cv_c_bigendian="$(BIG_ENDIAN)" \
|
||||
ac_cv_func_malloc_0_nonnull=yes \
|
||||
)
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
all install)
|
||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
all install
|
||||
endef
|
||||
|
||||
define Package/gphoto2/install
|
||||
|
Reference in New Issue
Block a user