X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=lang%2Fpygobject%2FMakefile;h=1fb2332d15ceadd71de3fa9a17c3bc3b6fab3fcd;hb=9817b65bb11ba8910e3e80508e8d38f702d6ae94;hp=a8e1bff72dacbfea05e65fcd14cc1d3f4ea400ca;hpb=1a7ebdeb62764dae6b10b9c9c8140395b12b8ed5;p=packages.git

diff --git a/lang/pygobject/Makefile b/lang/pygobject/Makefile
index a8e1bff72..1fb2332d1 100644
--- a/lang/pygobject/Makefile
+++ b/lang/pygobject/Makefile
@@ -4,25 +4,28 @@
 # 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.21.5
+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.21
+PKG_MD5SUM:=77ad7e8dbf13188364c9f56f907e530a
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-
-TARGET_LDFLAGS+=-I/home/lars/Projects/openwrt-olpc/staging_dir/i386/usr/include/python2.5
+include $(INCLUDE_DIR)/nls.mk
+$(call include_mk, python-package.mk)
 
 EXTRA_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/
+	-L$(ICONV_PREFIX) -L$(INTL_PREFIX)
+
+TARGET_CFLAGS += $(FPIC)
+CONFIGURE_ARGS += --enable-static --disable-instrospection
 
 define Package/python-gobject
   SUBMENU:=Python
@@ -30,20 +33,17 @@ define Package/python-gobject
   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 --disable-introspection \
+	)
 endef
 
 define Build/InstallDev
@@ -57,6 +57,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
@@ -82,6 +87,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} \
@@ -92,7 +102,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} \