postgresql, libgphoto2: r7941 is a better fix for parallel builds

[openwrt/svn-archive/archive.git] / libs / libgphoto2 / Makefile

diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile
index a416eb8cfd5dfe896252f7fc117b4fc0601f037d..00a37ca52309f45842413db81babded30dac703e 100644 (file)
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@@ -4,17 +4,17 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgphoto2
-PKG_VERSION:=2.2.1
+PKG_VERSION:=2.3.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
-PKG_MD5SUM:=69827311733e39fafa9f77bb05e55b77
+PKG_MD5SUM:=37f85e34e5b6031ddf6cac8b8782ac4f
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -31,7 +31,7 @@ endef
 
 define Package/libgphoto2
   $(call Package/libgphoto2/Default)
-  DEPENDS:=+libusb +libexif +libjpeg +libpthread
+  DEPENDS:=+libusb +libexif +libjpeg +libpthread +libltdl +libiconv
   TITLE:=The basic library of the gphoto2 program.
   MENU:=1
 endef
@@ -42,40 +42,28 @@ define Package/libgphoto2-drivers
   TITLE:=Gphoto2 drivers for various cameras
 endef
 
-BIG_ENDIAN:=no
-ifeq ($(ARCH),mips)
-  BIG_ENDIAN:=yes
-endif
-ifeq ($(ARCH),armeb)
-  BIG_ENDIAN:=yes
-endif
-ifeq ($(ARCH),powerpc)
-  BIG_ENDIAN:=yes
-endif
-
 define Build/Configure
        $(call Build/Configure/Default, \
                --enable-shared \
                --enable-static \
                --disable-rpath \
-               --with-gnu-ld \
                --with-drivers=all \
                --without-included-ltdl \
                --without-libiconv-prefix \
                --without-libintl-prefix \
                , \
+               CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \
+               LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
                LIBEXIF_CFLAGS="$$$$CPPFLAGS" \
                LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
                LIBUSB_CFLAGS="$$$$CPPFLAGS" \
                LIBUSB_LIBS="$$$$LDFLAGS -lusb" \
                LIBS="-lltdl" \
-               ac_cv_c_gettext_without_libintl=yes \
-               ac_cv_c_bigendian=$(BIG_ENDIAN) \
        )
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) -j$(CONFIG_JLEVEL) \
+       $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                LIBLTDL="" \
                all install
@@ -95,22 +83,25 @@ define Build/InstallDev
        $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libgphoto2.pc
        $(SED) 's,-I$$$${includedir}/gphoto2,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libgphoto2.pc
        $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libgphoto2.pc
+       # remove annoying recursive symlink
+       rm -f $(STAGING_DIR)/usr/include/gphoto2/gphoto2
 endef
 
 define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/bin/gphoto2-config \
+       rm -rf \
+               $(STAGING_DIR)/usr/bin/gphoto2-config \
                $(STAGING_DIR)/usr/bin/gphoto2-port-config \
                $(STAGING_DIR)/usr/include/gphoto2* \
                $(STAGING_DIR)/usr/lib/libgphoto*.{a,so*}
 endef
 
 define Package/libgphoto2/install
-       install -m0755 -d $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port}.so.* $(1)/usr/lib/
 endef
 
 define Package/libgphoto2-drivers/install
-       install -d -m0755 $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port} $(1)/usr/lib/
        rm -rf $(1)/usr/lib/libgphoto2{,_port}/*/*.{,l}a
 endef