[packages] srelay: add a patch to fix auth accepting any passwords (closes: #6781)

[openwrt/svn-archive/archive.git] / lang / pygobject / Makefile

diff --git a/lang/pygobject/Makefile b/lang/pygobject/Makefile
index 25ac82da3db952e96e2333f24c23c75fefba61e5..7114325ca8ba5b040d5ae01dd4b7b784078fde07 100644 (file)
--- a/lang/pygobject/Makefile
+++ b/lang/pygobject/Makefile
@@ -4,44 +4,45 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pygobject
-PKG_VERSION:=2.15.1
-PKG_RELEASE:=2
+PKG_VERSION:=2.16.0
+PKG_RELEASE:=1
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.15
-PKG_MD5SUM:=05bf0487c885a1ef6df615e02cac5ea6
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.16
+PKG_MD5SUM:=431e7d4632163b93d1ee43cd071a389c
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 EXTRA_LDFLAGS+= \
        -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
        -L$(STAGING_DIR)/usr/lib/libiconv/lib/
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/python-gobject
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=GLib bindings for python
   URL:=http://www.pygtk.org/
-  DEPENDS:=python-core +glib2
+  DEPENDS:=+python-mini +glib2 +libffi
 endef
 
 define Package/python-gobject/description
   GLib bindings for python
 endef
 
-define Build/Compile
-       (cd $(PKG_BUILD_DIR)/gobject; \
-        $(HOSTCC) -I$(STAGING_DIR)/usr/lib/glib-2.0/include/ \
-                  -I$(STAGING_DIR)/usr/include/glib-2.0/ \
-                           generate-constants.c -o generate-constants);
-       $(call Build/Compile/Default)
-       $(call Build/Install/Default)
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --with-libffi \
+       )
 endef
 
 define Build/InstallDev
@@ -55,6 +56,11 @@ define Build/InstallDev
                $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
                $(1)/usr/lib/pkgconfig/
 
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so,a,la} \
+               $(1)/usr/lib/
+
        $(SED) \
                "s,^\(prefix\|exec_prefix\|datadir\)=,\1=$(STAGING_DIR),g" \
                $(1)/usr/lib/pkgconfig/pygobject-2.0.pc
@@ -80,6 +86,11 @@ define Build/InstallDev
 endef
 
 define Package/python-gobject/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib
+
        $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
        $(INSTALL_DATA) \
                $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/*.{pth,py} \
@@ -90,7 +101,7 @@ define Package/python-gobject/install
                $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.py \
                $(1)$(PYTHON_PKG_DIR)/gtk-2.0/
 
-       $(foreach d,gobject gio, \
+       $(foreach d,gobject gio glib, \
                $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0/$(d); \
                $(INSTALL_DATA) \
                        $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/$(d)/*.{py,so} \