Commit 0eef3044 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'for-2011.02/python-bump' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 4c6a451a 6ea3c8bd

Makefile

+6 −0
Original line number Diff line number Diff line
@@ -437,6 +437,12 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y) 
	rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc

	rm -rf $(TARGET_DIR)/usr/share/gtk-doc

	-rmdir $(TARGET_DIR)/usr/share 2>/dev/null

endif

ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y)

	find $(TARGET_DIR)/usr/lib/ -name '*.pyc' -print0 | xargs -0 rm -f

endif

ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)

	find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f

endif

	find $(TARGET_DIR) -type f -perm +111 '!' -name 'libthread_db*.so*' | \

		xargs $(STRIPCMD) 2>/dev/null || true

package/Config.in

+2 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ source "package/libraw1394/Config.in" 
source "package/tslib/Config.in"

source "package/libusb/Config.in"

source "package/libusb-compat/Config.in"

source "package/python-serial/Config.in"

endmenu



if BROKEN
@@ -327,6 +328,7 @@ source "package/libcap/Config.in" 
source "package/libdaemon/Config.in"

source "package/libelf/Config.in"

source "package/libevent/Config.in"

source "package/libffi/Config.in"

source "package/libglib2/Config.in"

source "package/liboil/Config.in"

source "package/libsigc/Config.in"

package/Makefile.autotools.in

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ endif 
#

ifndef $(2)_INSTALL_CMDS

define $(2)_INSTALL_CMDS

	$(HOST_MAKE_ENV) $(MAKE) -C $$($$(PKG)_SRCDIR) install

	$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) -C $$($$(PKG)_SRCDIR) install

endef

endif

package/libffi/Config.in

0 → 100644
+9 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBFFI

	bool "libffi"

	help

	  The libffi library provides a portable, high level

	  programming interface to various calling conventions. This

	  allows a programmer to call any function specified by a call

	  interface description at run-time.



	  http://sourceware.org/libffi/

package/libffi/libffi.mk

0 → 100644
+33 −0
Original line number Diff line number Diff line 
#############################################################

#

# libffi

#

#############################################################



LIBFFI_VERSION = 3.0.9

LIBFFI_SITE    = ftp://sources.redhat.com/pub/libffi/



LIBFFI_INSTALL_STAGING = YES



# Move the headers to the usual location, and adjust the .pc file

# accordingly

define LIBFFI_MOVE_STAGING_HEADERS

	mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/

	sed -i '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc

	rm -rf $(TARGET_DIR)/usr/lib/libffi-*

endef



LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS



# Similar for target headers

define LIBFFI_MOVE_TARGET_HEADERS

	install -d $(TARGET_DIR)/usr/include/

	mv $(TARGET_DIR)/usr/lib/libffi-*/include/*.h $(TARGET_DIR)/usr/include/

	sed -i '/^includedir.*/d' $(TARGET_DIR)/usr/lib/pkgconfig/libffi.pc

	rm -rf $(TARGET_DIR)/usr/lib/libffi-*

endef



LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS



$(eval $(call AUTOTARGETS,package,libffi))